6 files changed, 19 insertions, 12 deletions
diff --git a/web/package.json b/web/package.json
index 31c2d6d6..77b13e8b 100644
--- a/web/package.json
+++ b/web/package.json
@@ -37,7 +37,8 @@
     "redux-logger": "^3.0.6",
     "redux-mock-store": "^1.3.0",
     "redux-thunk": "^2.2.0",
-    "shallowequal": "^1.0.2"
+    "shallowequal": "^1.0.2",
+    "stable": "^0.1.6"
   },
   "devDependencies": {
     "babel-core": "^6.26.0",
diff --git a/web/src/js/components/FlowTable/FlowColumns.jsx b/web/src/js/components/FlowTable/FlowColumns.jsx
index 02a4fba1..e60ed487 100644
--- a/web/src/js/components/FlowTable/FlowColumns.jsx
+++ b/web/src/js/components/FlowTable/FlowColumns.jsx
@@ -119,7 +119,7 @@ export function TimeColumn({ flow }) {
     return (
         <td className="col-time">
             {flow.response ? (
-                formatTimeDelta(1000 * (flow.response.timestamp_end - flow.server_conn.timestamp_start))
+                formatTimeDelta(1000 * (flow.response.timestamp_end - flow.request.timestamp_start))
             ) : (
                 '...'
             )}
diff --git a/web/src/js/ducks/utils/store.js b/web/src/js/ducks/utils/store.js
index ac272650..ad2242ee 100644
--- a/web/src/js/ducks/utils/store.js
+++ b/web/src/js/ducks/utils/store.js
@@ -1,3 +1,5 @@
+import stable from 'stable'
+
 export const SET_FILTER = 'LIST_SET_FILTER'
 export const SET_SORT = 'LIST_SET_SORT'
 export const ADD = 'LIST_ADD'
@@ -35,7 +37,7 @@ export default function reduce(state = defaultState, action) {
 
     switch (action.type) {
         case SET_FILTER:
-            view = list.filter(action.filter).sort(action.sort)
+            view = stable(list.filter(action.filter), action.sort)
             viewIndex = {}
             view.forEach((item, index) => {
                 viewIndex[item.id] = index
@@ -43,7 +45,7 @@ export default function reduce(state = defaultState, action) {
             break
 
         case SET_SORT:
-            view = [...view].sort(action.sort)
+            view = stable([...view], action.sort)
             viewIndex = {}
             view.forEach((item, index) => {
                 viewIndex[item.id] = index
diff --git a/web/src/js/filt/filt.js b/web/src/js/filt/filt.js
index 26058649..19a41af2 100644
--- a/web/src/js/filt/filt.js
+++ b/web/src/js/filt/filt.js
@@ -1929,7 +1929,7 @@ module.exports = (function() {
     function body(regex){
         regex = new RegExp(regex, "i");
         function bodyFilter(flow){
-            return True;
+            return true;
         }
         bodyFilter.desc = "body filters are not implemented yet, see https://github.com/mitmproxy/mitmweb/issues/10";
         return bodyFilter;
@@ -1937,7 +1937,7 @@ module.exports = (function() {
     function requestBody(regex){
         regex = new RegExp(regex, "i");
         function requestBodyFilter(flow){
-            return True;
+            return true;
         }
         requestBodyFilter.desc = "body filters are not implemented yet, see https://github.com/mitmproxy/mitmweb/issues/10";
         return requestBodyFilter;
@@ -1945,7 +1945,7 @@ module.exports = (function() {
     function responseBody(regex){
         regex = new RegExp(regex, "i");
         function responseBodyFilter(flow){
-            return True;
+            return true;
         }
         responseBodyFilter.desc = "body filters are not implemented yet, see https://github.com/mitmproxy/mitmweb/issues/10";
         return responseBodyFilter;
@@ -2104,4 +2104,4 @@ module.exports = (function() {
     SyntaxError: peg$SyntaxError,
     parse:       peg$parse
   };
-})();
-\ No newline at end of file
+})();
diff --git a/web/src/js/filt/filt.peg b/web/src/js/filt/filt.peg
index 12959474..e4b151ad 100644
--- a/web/src/js/filt/filt.peg
+++ b/web/src/js/filt/filt.peg
@@ -1,4 +1,4 @@
-// PEG.js filter rules - see http://pegjs.majda.cz/online
+// PEG.js filter rules - see https://pegjs.org/
 
 {
 var flowutils = require("../flow/utils.js");
@@ -72,7 +72,7 @@ function responseCode(code){
 function body(regex){
     regex = new RegExp(regex, "i");
     function bodyFilter(flow){
-        return True;
+        return true;
     }
     bodyFilter.desc = "body filters are not implemented yet, see https://github.com/mitmproxy/mitmweb/issues/10";
     return bodyFilter;
@@ -80,7 +80,7 @@ function body(regex){
 function requestBody(regex){
     regex = new RegExp(regex, "i");
     function requestBodyFilter(flow){
-        return True;
+        return true;
     }
     requestBodyFilter.desc = "body filters are not implemented yet, see https://github.com/mitmproxy/mitmweb/issues/10";
     return requestBodyFilter;
@@ -88,7 +88,7 @@ function requestBody(regex){
 function responseBody(regex){
     regex = new RegExp(regex, "i");
     function responseBodyFilter(flow){
-        return True;
+        return true;
     }
     responseBodyFilter.desc = "body filters are not implemented yet, see https://github.com/mitmproxy/mitmweb/issues/10";
     return responseBodyFilter;
diff --git a/web/yarn.lock b/web/yarn.lock
index aa5ae85f..1930fded 100644
--- a/web/yarn.lock
+++ b/web/yarn.lock
@@ -5449,6 +5449,10 @@ sshpk@^1.7.0:
     jsbn "~0.1.0"
     tweetnacl "~0.14.0"
 
+stable@^0.1.6:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.6.tgz#910f5d2aed7b520c6e777499c1f32e139fdecb10"
+
 statuses@1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"