diff --git a/app/component/FilterTimeTableModal.js b/app/component/FilterTimeTableModal.js
index 354e20cd33..44feeab568 100644
--- a/app/component/FilterTimeTableModal.js
+++ b/app/component/FilterTimeTableModal.js
@@ -1,6 +1,5 @@
 import PropTypes from 'prop-types';
 import React from 'react';
-import groupBy from 'lodash/groupBy';
 import intersection from 'lodash/intersection';
 import { FormattedMessage } from 'react-intl';
 import cx from 'classnames';
@@ -39,21 +38,20 @@ class FilterTimeTableModal extends React.Component {
   };
 
   handleCheckbox = routesToAdd => {
-    const oldHiddenRoutes =
+    const chosenRoutes =
       this.state.showRoutes.length > 0 ? this.state.showRoutes.slice() : [];
-    let newVal = routesToAdd;
-    if (oldHiddenRoutes.length > 0) {
-      newVal =
-        intersection(oldHiddenRoutes, routesToAdd).length === 0
-          ? oldHiddenRoutes.concat(routesToAdd)
-          : oldHiddenRoutes.filter(o => routesToAdd.indexOf(o) < 0);
-    }
-    if (newVal.length === 0) {
-      this.updateParent({ showRoutes: newVal, allRoutes: true });
-      this.setState({ showRoutes: newVal, allRoutes: true });
+
+    const newChosenRoutes =
+      chosenRoutes.indexOf(routesToAdd) < 0
+        ? chosenRoutes.concat([routesToAdd]) // concat when handling React state based array to avoid array length being assigned as a value
+        : chosenRoutes.map(o => o !== routesToAdd && o).filter(o => o);
+
+    if (newChosenRoutes.length === 0) {
+      this.updateParent({ showRoutes: newChosenRoutes, allRoutes: true });
+      this.setState({ showRoutes: newChosenRoutes, allRoutes: true });
     } else {
-      this.updateParent({ showRoutes: newVal });
-      this.setState({ allRoutes: false, showRoutes: newVal });
+      this.updateParent({ showRoutes: newChosenRoutes });
+      this.setState({ allRoutes: false, showRoutes: newChosenRoutes });
     }
   };
 
@@ -63,22 +61,39 @@ class FilterTimeTableModal extends React.Component {
     });
   }
 
-  constructRouteDivs = val => {
+  constructRouteDivs = () => {
     const routeDivs = [];
     const LONG_LINE_NAME = 5;
-    val.forEach(o =>
+    // Find out which departures are ARRIVING to their final stop, not real departures
+    // then remove them
+    const routesWithStopTimes = this.props.stop.stoptimesForServiceDate
+      .map(
+        o =>
+          o.stoptimes.length > 0 &&
+          o.stoptimes[0].pickupType !== 'NONE' && {
+            code: o.pattern.code,
+            headsign: o.pattern.headsign,
+            shortName: o.pattern.route.shortName,
+            mode: o.pattern.route.mode,
+            agency: o.pattern.route.agency.name,
+          },
+      )
+      .filter(o => o)
+      .sort(routeCompare);
+
+    routesWithStopTimes.forEach(o =>
       routeDivs.push(
-        <div key={o.codes[0]} className="route-row">
+        <div key={o.code} className="route-row">
           <div className="checkbox-container">
             <input
               type="checkbox"
-              checked={intersection(this.state.showRoutes, o.codes).length > 0}
-              id={`input-${o.codes[0]}`}
-              onChange={() => this.handleCheckbox(o.codes)}
+              checked={intersection(this.state.showRoutes, [o.code]).length > 0}
+              id={`input-${o.code}`}
+              onChange={() => this.handleCheckbox(o.code)}
             />
             {/* TODO: Add label for this */}
             {/* eslint-disable jsx-a11y/label-has-for */}
-            <label htmlFor={`input-${o.codes[0]}`} />
+            <label htmlFor={`input-${o.code}`} />
             {/* eslint-enable jsx-a11y/label-has-for */}
           </div>
           <div className="route-mode">
@@ -109,42 +124,9 @@ class FilterTimeTableModal extends React.Component {
     }
   };
 
-  constructRoutes = () => {
-    const patternGroups = groupBy(
-      this.props.stop.stoptimesForServiceDate.map(a => a.pattern),
-      pattern =>
-        JSON.stringify([
-          pattern.headsign,
-          pattern.route.shortName,
-          pattern.route.mode,
-          pattern.route.agency.name,
-        ]),
-    );
-
-    const mappedGroups = Object.entries(patternGroups).map(([key, group]) => [
-      JSON.parse(key),
-      group.map(pattern => pattern.code),
-    ]);
-    const cleanedUpavailableRoutes = mappedGroups.map(
-      ([[headsign, shortName, mode, agency], codes]) => ({
-        headsign,
-        shortName,
-        mode,
-        agency,
-        codes,
-      }),
-    );
-
-    return cleanedUpavailableRoutes.sort(routeCompare);
-  };
-
   /* eslint-disable jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions */
   render() {
-    // const availableRoutes = (
-    //    this.props.stop.stoptimesForServiceDate).map(o => Object.assign(o.pattern),
-    //    );
-    const routes = this.constructRoutes();
-    const routeList = this.constructRouteDivs(routes);
+    const routeList = this.constructRouteDivs();
     return (
       <div>
         <div className="filter-stop-modal-overlay" />
diff --git a/app/component/TimeTableOptionsPanel.js b/app/component/TimeTableOptionsPanel.js
index 9d76f7b2ac..2ccfcc1c80 100644
--- a/app/component/TimeTableOptionsPanel.js
+++ b/app/component/TimeTableOptionsPanel.js
@@ -40,7 +40,7 @@ class TimeTableOptionsPanel extends React.Component {
     return (
       <div className="timetable-options-panel">
         <div className="timetable-showroutes">
-          <div className="showroutes-icon">
+          <div className={`showroutes-icon ${stopVehicle}`}>
             <Icon
               img={`icon-icon_${stopVehicle}`}
               className="showroutes-icon-svg"
diff --git a/app/component/Timetable.js b/app/component/Timetable.js
index f1b5d3b85e..a814d195bc 100644
--- a/app/component/Timetable.js
+++ b/app/component/Timetable.js
@@ -106,9 +106,7 @@ class Timetable extends React.Component {
       .map(stoptime =>
         stoptime.stoptimes.filter(st => st.pickupType !== 'NONE').map(st => ({
           id: stoptime.pattern.code,
-          name:
-            stoptime.pattern.route.shortName ||
-            stoptime.pattern.route.agency.name,
+          name: stoptime.pattern.route.shortName || stoptime.pattern.headsign,
           scheduledDeparture: st.scheduledDeparture,
           serviceDay: st.serviceDay,
           headsign: stoptime.pattern.headsign,
@@ -325,6 +323,7 @@ const exampleStop = {
       pattern: {
         route: {
           mode: 'BUS',
+          shortName: 'Kotkan linja-autoasema',
           agency: {
             name: 'Helsingin seudun liikenne',
           },
diff --git a/app/component/TimetableRow.js b/app/component/TimetableRow.js
index 4c83c500c7..1df5cf56b6 100644
--- a/app/component/TimetableRow.js
+++ b/app/component/TimetableRow.js
@@ -1,9 +1,6 @@
 import PropTypes from 'prop-types';
 import React from 'react';
 import moment from 'moment';
-import cx from 'classnames';
-
-const LONG_LINE_NAME = 5;
 
 const TimetableRow = ({ title, stoptimes, showRoutes, timerows }) => (
   <div style={{ display: 'block' }}>
@@ -29,21 +26,11 @@ const TimetableRow = ({ title, stoptimes, showRoutes, timerows }) => (
               className="timetablerow-linetime"
               key={`${time.id}-${time.name}-${time.scheduledDeparture}`}
             >
-              <span
-                className={cx({
-                  'overflow-fade':
-                    time.name && time.name.length > LONG_LINE_NAME,
-                })}
-              >
+              <span>
                 {(showRoutes.filter(o => o === time.id).length > 0 &&
                   showRoutes.length > 0) ||
                 showRoutes.length === 0 ? (
-                  <div
-                    className={cx({
-                      'overflow-fade':
-                        time.name && time.name.length > LONG_LINE_NAME,
-                    })}
-                  >
+                  <div>
                     <span className="bold">
                       {moment
                         .unix(time.serviceDay + time.scheduledDeparture)
diff --git a/test/visual-images/Timetable_normal/normal/chrome.png b/test/visual-images/Timetable_normal/normal/chrome.png
index 263829c106..745b81b9b8 100644
Binary files a/test/visual-images/Timetable_normal/normal/chrome.png and b/test/visual-images/Timetable_normal/normal/chrome.png differ
diff --git a/test/visual-images/Timetable_normal/normal/edge15.png b/test/visual-images/Timetable_normal/normal/edge15.png
index af14a83f53..718e0c30df 100644
Binary files a/test/visual-images/Timetable_normal/normal/edge15.png and b/test/visual-images/Timetable_normal/normal/edge15.png differ
diff --git a/test/visual-images/Timetable_normal/normal/firefox.png b/test/visual-images/Timetable_normal/normal/firefox.png
index 064ae70afe..789660c899 100644
Binary files a/test/visual-images/Timetable_normal/normal/firefox.png and b/test/visual-images/Timetable_normal/normal/firefox.png differ
diff --git a/test/visual-images/Timetable_normal/normal/ie11.png b/test/visual-images/Timetable_normal/normal/ie11.png
index 1f46d0099b..b3902d32de 100644
Binary files a/test/visual-images/Timetable_normal/normal/ie11.png and b/test/visual-images/Timetable_normal/normal/ie11.png differ
diff --git a/test/visual-images/Timetable_normal/normal/safari10.png b/test/visual-images/Timetable_normal/normal/safari10.png
index fb1bb7d4b7..b35a316a08 100644
Binary files a/test/visual-images/Timetable_normal/normal/safari10.png and b/test/visual-images/Timetable_normal/normal/safari10.png differ