diff --git a/LCU/Maintenance/MDB_WebView/maintenancedb_view/src/components/Toolbar.js b/LCU/Maintenance/MDB_WebView/maintenancedb_view/src/components/Toolbar.js
index f705fe1dd11aa51ae5f7b3a6d44c64929eab9239..bd52ef91c6a39f0d296d2eb5b3b2a9aa7b7b9fc9 100644
--- a/LCU/Maintenance/MDB_WebView/maintenancedb_view/src/components/Toolbar.js
+++ b/LCU/Maintenance/MDB_WebView/maintenancedb_view/src/components/Toolbar.js
@@ -165,7 +165,8 @@ export const TestTypeSelector = connect(mapStateTestTypeSelector, mapDispatchTes
  */
 class AntennaTypeSelectorC extends Component {
 
-    onAntennaTypeClick(type){
+    onAntennaTypeClick = (e) => {
+        let type = e.currentTarget.innerHTML;
         this.props.setAntennaType(type);
     }
 
@@ -173,9 +174,9 @@ class AntennaTypeSelectorC extends Component {
         return (<div className="toolbar-ctrl">
             <label>Type&nbsp;&nbsp;</label>
             <ButtonGroup size="sm">
-                <Button color="info" onClick={() => this.onAntennaTypeClick('HBA')} active={this.props.antennaType === 'HBA'}>HBA</Button>
-                <Button color="info" onClick={() => this.onAntennaTypeClick('LBL')} active={this.props.antennaType === 'LBL'}>LBL</Button>
-                <Button color="info" onClick={() => this.onAntennaTypeClick('LBH')} active={this.props.antennaType === 'LBH'}>LBH</Button>
+                <Button color="info" onClick={this.onAntennaTypeClick} active={this.props.antennaType === 'HBA'}>HBA</Button>
+                <Button color="info" onClick={this.onAntennaTypeClick} active={this.props.antennaType === 'LBH'}>LBH</Button>
+                <Button color="info" onClick={this.onAntennaTypeClick} active={this.props.antennaType === 'LBL'}>LBL</Button>
             </ButtonGroup>
         </div>);
     }
@@ -267,7 +268,7 @@ class ErrorTypesSelectorC extends Component {
                 placeHolder="All"
                 options={errorTypes}
                 selectedItems={this.props.selectedErrorTypes}
-                onSelectionChange={(e)=> this.onSelectionErrorTypes(e)}
+                onSelectionChange={this.onSelectionErrorTypes}
             />
         </div>);
     }
@@ -336,9 +337,12 @@ class ErrorsOnlySelectorC extends Component {
     }
 
     render() {
-        return (<div className="toolbar-ctrl">
-            <Button color="info" size="sm" onClick={this.onErrorsOnlyClick} active={this.props.errorsOnly}>Errors only</Button>
-        </div>);
+        return (
+            <div className="toolbar-ctrl">
+                <Button color="info" size="sm" onClick={this.onErrorsOnlyClick} active={this.props.errorsOnly}>
+                    Errors only
+                </Button>
+            </div>);
     }
 }