diff --git a/README.md b/README.md
index ed1ee90c..1509ca03 100644
--- a/README.md
+++ b/README.md
@@ -23,21 +23,21 @@ You can reproduce these values by running `sh measure-metrics.sh` in the root fo
 
 <!-- !!! DO NOT EDIT THIS TABLE DIRECTLY, IT IS GENERATED BY ./scripts/aggregate-metrics.mjs !!! -->
 
-| Metric \ Project                        | aws              | firebase       | pouchdb           | rxdb              | watermelondb      |
-| --------------------------------------- | ---------------- | -------------- | ----------------- | ----------------- | ----------------- |
-| First angular component render          | 207ms            | 270ms          | 197ms             | 201ms             | 210ms             |
-| Page load time                          | 294ms            | 178ms          | 271ms             | 284ms             | 293ms             |
-| First full render                       | 452ms            | 1475ms         | 1398ms            | 1454ms            | 344ms             |
-| Insert one message                      | 23ms             | 380ms          | 19ms              | 128ms             | 9ms               |
-| Inserting 20 messages one after another | 651ms            | 8012ms         | 581ms             | 1884ms            | 33ms              |
-| Inserting 20 messages in parallel       | 187ms            | 7039ms         | 126ms             | 1705ms            | 1582ms            |
-| Message insert to message list change   | 59ms             | 30ms           | 386ms             | 19ms              | 4ms               |
-| User change to message list change      | 13ms             | 192ms          | 311ms             | 282ms             | 6ms               |
-| Message search query time               | 485ms            | 299ms          | 305ms             | 90ms              | 29ms              |
-| First full render with many messages    | 408ms            | 1922ms         | 1869ms            | 2287ms            | 293ms             |
-| Storage usage                           | 199kb            | 3478kb         | 1395kb            | 2311kb            | 1824kb            |
-| Bundle size, plain JavaScript           | 1545kb           | 915kb          | 800kb             | 1084kb            | 895kb             |
-| Bundle size, minified+gzip              | 358kb            | 224kb          | 192kb             | 278kb             | 208kb             |
+| Metric \ Project                        | aws    | firebase | pouchdb | rxdb-lokijs | rxdb-pouchdb | watermelondb |
+| --------------------------------------- | ------ | -------- | ------- | ----------- | ------------ | ------------ |
+| First angular component render          | 289ms  | 327ms    | 264ms   | 207ms       | 215ms        | 192ms        |
+| Page load time                          | 382ms  | 246ms    | 345ms   | 290ms       | 298ms        | 268ms        |
+| First full render                       | 560ms  | 1648ms   | 1585ms  | 647ms       | 1528ms       | 315ms        |
+| Insert one message                      | 47ms   | 432ms    | 27ms    | 13ms        | 26ms         | 7ms          |
+| Inserting 20 messages one after another | 747ms  | 9795ms   | 681ms   | 1350ms      | 1829ms       | 32ms         |
+| Inserting 20 messages in parallel       | 340ms  | 7982ms   | 146ms   | 1080ms      | 1718ms       | 1547ms       |
+| Message insert to message list change   | 89ms   | 32ms     | 450ms   | 13ms        | 25ms         | 5ms          |
+| User change to message list change      | 22ms   | 194ms    | 349ms   | 5ms         | 316ms        | 5ms          |
+| Message search query time               | 600ms  | 408ms    | 355ms   | 27ms        | 124ms        | 28ms         |
+| First full render with many messages    | 493ms  | 2308ms   | 2012ms  | 623ms       | 2589ms       | 293ms        |
+| Storage usage                           | 200kb  | 3250kb   | 1369kb  | 228kb       | 2289kb       | 1767kb       |
+| Bundle size, plain JavaScript           | 1573kb | 915kb    | 801kb   | 1083kb      | 1082kb       | 852kb        |
+| Bundle size, minified+gzip              | 364kb  | 224kb    | 192kb   | 269kb       | 277kb        | 199kb        |
 
 
 ### Metrics Explanation
diff --git a/package.json b/package.json
index b9bb604b..5834296b 100644
--- a/package.json
+++ b/package.json
@@ -36,8 +36,8 @@
     "start:aws": "http-server ./dist/aws -p 3000 -c 2592000",
     "start:firebase": "concurrently \"npm run server:firebase\" \"sleep 10 && http-server ./dist/firebase -p 3000 -c 2592000\"",
     "start:pouchdb": "concurrently \"npm run server:pouchdb\" \"http-server ./dist/pouchdb -p 3000 -c 2592000\"  --kill-others --success first",
-    "start:rxdb-pouchdb": "concurrently \"npm run server:rxdb-pouchdb\" \"http-server ./dist/rxdb -p 3000 -c 2592000\"",
-    "start:rxdb-lokijs": "concurrently \"npm run server:rxdb\" \"http-server ./dist/rxdb-lokijs -p 3000 -c 2592000\"",
+    "start:rxdb-pouchdb": "concurrently \"npm run server:rxdb-pouchdb\" \"http-server ./dist/rxdb-pouchdb -p 3000 -c 2592000\"",
+    "start:rxdb-lokijs": "concurrently \"npm run server:rxdb-pouchdb\" \"http-server ./dist/rxdb-lokijs -p 3000 -c 2592000\"",
     "start:watermelondb": "http-server ./dist/watermelondb -p 3000 -c 2592000",
     "server:firebase": "concurrently \"firebase emulators:start --only firestore\" \"npm run server:firebase:import\"",
     "server:firebase:setup": "firebase setup:emulators:firestore",
@@ -59,7 +59,7 @@
     "test:aws": "PROJECT_KEY=aws concurrently \"npm run start:aws\" \"npm run test:wait-for-frontend && npm run test\" --kill-others --success first",
     "test:firebase": "PROJECT_KEY=firebase concurrently \"npm run start:firebase\" \"npm run test:wait-for-frontend && npm run test\" --kill-others --success first",
     "test:pouchdb": "PROJECT_KEY=pouchdb concurrently \"npm run start:pouchdb\" \"npm run test:wait-for-frontend && npm run test\" --kill-others --success first",
-    "test:rxdb-pouchdb": "PROJECT_KEY=rxdb-pouchdb concurrently \"npm run start:rxdb\" \"npm run test:wait-for-frontend && npm run test\" --kill-others --success first",
+    "test:rxdb-pouchdb": "PROJECT_KEY=rxdb-pouchdb concurrently \"npm run start:rxdb-pouchdb\" \"npm run test:wait-for-frontend && npm run test\" --kill-others --success first",
     "test:rxdb-lokijs": "PROJECT_KEY=rxdb-lokijs concurrently \"npm run start:rxdb-lokijs\" \"npm run test:wait-for-frontend && npm run test\" --kill-others --success first",
     "test:watermelondb": "PROJECT_KEY=watermelondb concurrently \"npm run start:watermelondb\" \"npm run test:wait-for-frontend && npm run test\" --kill-others --success first"
   },