diff --git a/src/components/Timeline.jsx b/src/components/Timeline.jsx
index e582bc9..613b2b6 100644
--- a/src/components/Timeline.jsx
+++ b/src/components/Timeline.jsx
@@ -98,7 +98,6 @@ class Timeline extends React.Component {
 
 function mapStateToProps(state) {
   return {
-    // events: selectors.selectEvents(state),
     events: state.domain.events,
     categories: selectors.selectCategories(state),
     language: state.app.language,
@@ -109,5 +108,4 @@ function mapStateToProps(state) {
   }
 }
 
-export default connect(mapStateToProps)(Timeline);
-// export default Timeline
\ No newline at end of file
+export default connect(mapStateToProps)(Timeline);
\ No newline at end of file
diff --git a/src/js/timeline/timeline.js b/src/js/timeline/timeline.js
index 382a90a..09bfe74 100644
--- a/src/js/timeline/timeline.js
+++ b/src/js/timeline/timeline.js
@@ -56,7 +56,6 @@ export default function(app, ui) {
   let timerange = app.timerange;
 
   const timeFilter = app.filter;
-  const select = app.select;
   const getCategoryLabel = app.getCategoryLabel;
   const getCategoryColor = app.getCategoryColor;
 
@@ -295,11 +294,10 @@ export default function(app, ui) {
    */
   function getAllEventsAtOnce(eventPoint) {
     const timestamp = eventPoint.timestamp;
-    const categoryGroup = eventPoint.category;
-    return events.filter(event => {
-      return (event.timestamp === timestamp &&
-        categoryGroup === event.category)
-    }).map(event => event.id);
+    const category = eventPoint.category;
+    return events
+      .filter(event => (event.timestamp === timestamp && category === event.category))
+      .map(event => event.id);
   }
 
   /*
@@ -367,7 +365,7 @@ export default function(app, ui) {
    * @param {String} direction: 'forward' / 'backwards'
    */
   function moveTime(direction) {
-    select();
+    app.select();
     const extent = getTimeScaleExtent();
     const newCentralTime = d3.timeMinute.offset(scale.x.domain()[0], extent / 2);
 
@@ -479,7 +477,9 @@ export default function(app, ui) {
       .attr('cx', eventPoint => getEventX(eventPoint))
       .attr('cy', eventPoint => getEventY(eventPoint))
       .style('fill', eventPoint => getEventPointFillColor(eventPoint))
-      .on('click', eventPoint => select(getAllEventsAtOnce(eventPoint)))
+      .on('click', eventPoint => {
+        return app.select(getAllEventsAtOnce(eventPoint))
+      })
       .on('mouseover', handleMouseOver)
       .on('mouseout', handleMouseOut)
       .transition()