5 files changed, 13 insertions, 14 deletions
diff --git a/web/src/js/components/EventLog.jsx b/web/src/js/components/EventLog.jsx
index 169162ee..1072b124 100644
--- a/web/src/js/components/EventLog.jsx
+++ b/web/src/js/components/EventLog.jsx
@@ -1,6 +1,6 @@
 import React, { Component, PropTypes } from 'react'
 import { connect } from 'react-redux'
-import { toggleEventLogFilter, toggleEventLogVisibility } from '../ducks/eventLog'
+import { toggleFilter, toggleVisibility } from '../ducks/eventLog'
 import ToggleButton from './common/ToggleButton'
 import EventList from './EventLog/EventList'
 
@@ -73,7 +73,7 @@ export default connect(
         events: state.eventLog.filteredEvents,
     }),
     {
-        onClose: toggleEventLogVisibility,
-        onToggleFilter: toggleEventLogFilter,
+        onClose: toggleVisibility,
+        onToggleFilter: toggleFilter,
     }
 )(EventLog)
diff --git a/web/src/js/components/FlowTable/FlowTableHead.jsx b/web/src/js/components/FlowTable/FlowTableHead.jsx
index 840f6a34..afbd7906 100644
--- a/web/src/js/components/FlowTable/FlowTableHead.jsx
+++ b/web/src/js/components/FlowTable/FlowTableHead.jsx
@@ -3,7 +3,7 @@ import { connect } from 'react-redux'
 import classnames from 'classnames'
 import columns from './FlowColumns'
 
-import { setSort } from "../../ducks/flows"
+import { updateSorter } from "../../ducks/flows"
 
 FlowTableHead.propTypes = {
     onSort: PropTypes.func.isRequired,
@@ -19,7 +19,7 @@ function FlowTableHead({ sortColumn, sortDesc, onSort }) {
             {columns.map(Column => (
                 <th className={classnames(Column.headerClass, sortColumn === Column.name && sortType)}
                     key={Column.name}
-                    onClick={() => onSort({ sortColumn: Column.name, sortDesc: Column.name !== sortColumn ? false : !sortDesc })}>
+                    onClick={() => onSort(Column.name, Column.name !== sortColumn ? false : !sortDesc, Column.sortKeyFun)}>
                     {Column.headerName}
                 </th>
             ))}
@@ -33,6 +33,6 @@ export default connect(
         sortColumn: state.flows.sort.sortColumn,
     }),
     {
-        onSort: setSort,
+        onSort: updateSorter,
     }
 )(FlowTableHead)
diff --git a/web/src/js/components/Header.jsx b/web/src/js/components/Header.jsx
index ab25eb41..5ebe8c7e 100644
--- a/web/src/js/components/Header.jsx
+++ b/web/src/js/components/Header.jsx
@@ -1,7 +1,6 @@
 import React, { Component, PropTypes } from 'react'
 import { connect } from 'react-redux'
 import classnames from 'classnames'
-import { toggleEventLogVisibility } from '../ducks/eventLog'
 import MainMenu from './Header/MainMenu'
 import ViewMenu from './Header/ViewMenu'
 import OptionMenu from './Header/OptionMenu'
diff --git a/web/src/js/components/Header/ViewMenu.jsx b/web/src/js/components/Header/ViewMenu.jsx
index 8d662c28..894fa71a 100644
--- a/web/src/js/components/Header/ViewMenu.jsx
+++ b/web/src/js/components/Header/ViewMenu.jsx
@@ -1,7 +1,7 @@
 import React, { PropTypes } from 'react'
 import { connect } from 'react-redux'
 import ToggleButton from '../common/ToggleButton'
-import { toggleEventLogVisibility } from '../../ducks/eventLog'
+import { toggleVisibility } from '../../ducks/eventLog'
 
 ViewMenu.title = 'View'
 ViewMenu.route = 'flows'
@@ -27,6 +27,6 @@ export default connect(
         visible: state.eventLog.visible,
     }),
     {
-        onToggle: toggleEventLogVisibility,
+        onToggle: toggleVisibility,
     }
 )(ViewMenu)
diff --git a/web/src/js/components/MainView.jsx b/web/src/js/components/MainView.jsx
index 7064d3bf..a271a7f0 100644
--- a/web/src/js/components/MainView.jsx
+++ b/web/src/js/components/MainView.jsx
@@ -6,7 +6,7 @@ import { Key } from '../utils.js'
 import Splitter from './common/Splitter'
 import FlowTable from './FlowTable'
 import FlowView from './FlowView'
-import { selectFlow, setFilter, setHighlight } from '../ducks/flows'
+import { selectFlow, updateFilter, updateHighlight } from '../ducks/flows'
 
 class MainView extends Component {
 
@@ -25,10 +25,10 @@ class MainView extends Component {
             this.props.selectFlow(nextProps.routeParams.flowId)
         }
         if (nextProps.location.query[Query.SEARCH] !== nextProps.filter) {
-            this.props.setFilter(nextProps.location.query[Query.SEARCH], false)
+            this.props.updateFilter(nextProps.location.query[Query.SEARCH], false)
         }
         if (nextProps.location.query[Query.HIGHLIGHT] !== nextProps.highlight) {
-            this.props.setHighlight(nextProps.location.query[Query.HIGHLIGHT], false)
+            this.props.updateHighlight(nextProps.location.query[Query.HIGHLIGHT], false)
         }
     }
 
@@ -190,8 +190,8 @@ export default connect(
     }),
     {
         selectFlow,
-        setFilter,
-        setHighlight,
+        updateFilter,
+        updateHighlight,
     },
     undefined,
     { withRef: true }