diff --git a/_includes/papers-filter.html b/_includes/papers-filter.html
new file mode 100644
index 0000000..3ffd465
--- /dev/null
+++ b/_includes/papers-filter.html
@@ -0,0 +1,75 @@
+<p>This page contains a comprehensive list of research publications on CRDTs.
+The data is available <a href="papers_bib.html">in BibTeX format</a>.
+If you have anything to add or correct, please
+<a href="https://github.com/ept/crdt-website/edit/master/papers.bib">edit the file on GitHub</a>
+and send us a pull request.</p>
+
+<p><strong>Select checkboxes to filter papers by topic:</strong></p>
+<form id="papers-filter">
+    <input type="checkbox" id="introduction" name="introduction">
+    <label for="introduction">Introductions to CRDTs</label><br>
+
+    <input type="checkbox" id="systems" name="systems">
+    <label for="systems">Systems and apps using CRDTs</label><br>
+
+    <input type="checkbox" id="operation-based" name="operation-based">
+    <label for="operation-based">Operation-based CRDTs</label><br>
+
+    <input type="checkbox" id="state-based" name="state-based">
+    <label for="state-based">State-based and Delta CRDTs</label><br>
+
+    <input type="checkbox" id="counters" name="counters">
+    <label for="counters">Counter CRDTs</label><br>
+
+    <input type="checkbox" id="text-editing" name="text-editing">
+    <label for="text-editing">Text editing/sequence CRDTs</label><br>
+
+    <input type="checkbox" id="undo" name="undo">
+    <label for="undo">Undoing operations</label><br>
+
+    <input type="checkbox" id="trees" name="trees">
+    <label for="trees">CRDTs for trees</label><br>
+
+    <input type="checkbox" id="computation" name="computation">
+    <label for="computation">Computation/programming</label><br>
+
+    <input type="checkbox" id="composition" name="composition">
+    <label for="composition">Composing CRDTs</label><br>
+
+    <input type="checkbox" id="verification" name="verification">
+    <label for="verification">Specification and verification</label><br>
+
+    <input type="checkbox" id="crdt-related" name="crdt-related">
+    <label for="crdt-related">Close relatives of CRDTs</label><br>
+</form>
+
+<script>
+const checkboxes = document.querySelectorAll('form#papers-filter input[type="checkbox"]')
+
+for (let checkbox of checkboxes) {
+    checkbox.addEventListener('change', () => {
+        let selected = []
+        for (let cb of checkboxes) {
+            if (cb.checked) selected.push(cb.name)
+        }
+
+        const regex = new RegExp(selected.join('|'))
+
+        for (let element of document.querySelectorAll('div.td-content > dl > dd')) {
+            let keywords = element.querySelector('blockquote')
+            let previous = element
+            do {
+                previous = previous.previousSibling
+            } while (previous.nodeType !== Node.ELEMENT_NODE || previous.tagName !== 'DT')
+
+            if (selected.length === 0 || (keywords && regex.test(keywords.innerText))) {
+                previous.className = 'selected'
+            } else {
+                previous.className = 'unselected'
+            }
+        }
+    })
+}
+</script>
+
+<h2>Paper List</h2>
diff --git a/assets/css/main.css b/assets/css/main.css
index 5b3e2d4..9c68c77 100644
--- a/assets/css/main.css
+++ b/assets/css/main.css
@@ -18594,3 +18594,13 @@ footer {
         visibility: hidden
     }
 }
+
+div.td-content > dl > dt.selected,
+div.td-content > dl > dt.selected + dd {
+    display: block
+}
+
+div.td-content > dl > dt.unselected,
+div.td-content > dl > dt.unselected + dd {
+    display: none
+}
diff --git a/papers.bib b/papers.bib
index decc18b..55a0ddb 100644
--- a/papers.bib
+++ b/papers.bib
@@ -31,8 +31,9 @@ @inproceedings{Shapiro2011CRDTs
 pages = {386--400},
 doi = {10.1007/978-3-642-24550-3_29},
 pdf = {https://pages.lip6.fr/Marek.Zawirski/papers/RR-7687.pdf},
-publisher = {Springer LNCS volume 6976}
-} 
+publisher = {Springer LNCS volume 6976},
+keywords = {introduction}
+}
 
 @techreport{Shapiro2011comprehensive,
 author = {Shapiro, Marc and Pregui{\c c}a, Nuno and Baquero, Carlos and Zawirski, Marek},
@@ -42,7 +43,8 @@ @techreport{Shapiro2011comprehensive
 month = jan,
 institution = {INRIA},
 type = {Research Report},
-url = {http://hal.inria.fr/inria-00555588/}
+url = {http://hal.inria.fr/inria-00555588/},
+keywords = {introduction}
 }
 
 @article{Letia2010consistency,
@@ -56,7 +58,8 @@ @article{Letia2010consistency
 month = apr,
 publisher = {ACM},
 doi = {10.1145/1773912.1773921},
-pdf = {http://asc.di.fct.unl.pt/~nmp/pubs/osr-2010.pdf}
+pdf = {http://asc.di.fct.unl.pt/~nmp/pubs/osr-2010.pdf},
+keywords = {introduction}
 }
 
 @article{Burckhardt2014principles,
@@ -70,7 +73,8 @@ @article{Burckhardt2014principles
 month = oct,
 publisher = {now publishers},
 doi = {10.1561/2500000011},
-pdf = {https://www.nowpublishers.com/article/Download/PGL-011}
+pdf = {https://www.nowpublishers.com/article/Download/PGL-011},
+keywords = {introduction}
 }
 
 @incollection{Preguica2018encyclopedia,
@@ -81,7 +85,8 @@ @incollection{Preguica2018encyclopedia
 month = may,
 publisher = {Springer},
 doi = {10.1007/978-3-319-63962-8_185-1},
-eprint = {1805.06358}
+eprint = {1805.06358},
+keywords = {introduction}
 }
 
 @article{Preguica2018crdts,
@@ -90,7 +95,8 @@ @article{Preguica2018crdts
 year = {2018},
 month = jun,
 eprint = {1806.10254},
-url = {https://arxiv.org/abs/1806.10254}
+url = {https://arxiv.org/abs/1806.10254},
+keywords = {introduction}
 }
 
 % Operation-based, state-based, delta-based
@@ -106,6 +112,7 @@ @inproceedings{Baquero2014opbased
 publisher = {Springer LNCS volume 8460},
 doi = {10.1007/978-3-662-43352-2_11},
 pdf = {http://gsd.di.uminho.pt/members/cbm/ps/crdtOpsMiddleware.pdf},
+keywords = {operation-based},
 note = {A shorter paper with the same title appears in PaPEC 2014}
 }
 
@@ -115,7 +122,8 @@ @article{Baquero2017pure
 year = {2017},
 eprint = {1710.04469},
 month = oct,
-url = {https://arxiv.org/abs/1710.04469}
+url = {https://arxiv.org/abs/1710.04469},
+keywords = {operation-based}
 }
 
 @techreport{Baquero2015composition,
@@ -124,7 +132,8 @@ @techreport{Baquero2015composition
 year = {2015},
 month = may,
 institution = {HASLab, INESC TEC},
-url = {http://haslab.uminho.pt/cbm/files/crdtcompositionreport.pdf}
+url = {http://haslab.uminho.pt/cbm/files/crdtcompositionreport.pdf},
+keywords = {state-based}
 }
 
 @inproceedings{Almeida2015delta,
@@ -137,7 +146,8 @@ @inproceedings{Almeida2015delta
 month = may,
 publisher = {Springer LNCS volume 9466},
 doi = {10.1007/978-3-319-26850-7_5},
-eprint = {1410.2803}
+eprint = {1410.2803},
+keywords = {state-based}
 }
 
 @inproceedings{vanderLinde06delta,
@@ -149,7 +159,8 @@ @inproceedings{vanderLinde06delta
 articleno = {12},
 publisher = {ACM},
 doi = {10.1145/2911151.2911163},
-pdf = {https://novasys.di.fct.unl.pt/~alinde/publications/a12-van_der_linde.pdf}
+pdf = {https://novasys.di.fct.unl.pt/~alinde/publications/a12-van_der_linde.pdf},
+keywords = {state-based}
 }
 
 % https://blog.acolyer.org/2016/04/25/delta-state-replicated-data-types/
@@ -161,7 +172,8 @@ @article{Almeida2018delta
 pages = {162--173},
 year = {2018},
 eprint = {1603.01529},
-doi = {10.1016/j.jpdc.2017.08.003}
+doi = {10.1016/j.jpdc.2017.08.003},
+keywords = {state-based}
 }
 
 @inproceedings{Yu2019undo,
@@ -174,7 +186,8 @@ @inproceedings{Yu2019undo
 publisher = {Dagstuhl LIPIcs},
 articleno = {14},
 doi = {10.4230/LIPIcs.OPODIS.2019.14},
-pdf = {https://drops.dagstuhl.de/opus/volltexte/2020/11800/pdf/LIPIcs-OPODIS-2019-14.pdf}
+pdf = {https://drops.dagstuhl.de/opus/volltexte/2020/11800/pdf/LIPIcs-OPODIS-2019-14.pdf},
+keywords = {state-based, undo}
 }
 
 @inproceedings{Enes2019synchronization,
@@ -186,7 +199,8 @@ @inproceedings{Enes2019synchronization
 month = apr,
 pages = {148--159},
 doi = {10.1109/ICDE.2019.00022},
-eprint = {1803.02750}
+eprint = {1803.02750},
+keywords = {state-based}
 }
 
 % Text editing CRDTs
@@ -202,13 +216,14 @@ @inproceedings{Oster2006WOOT
 publisher = {ACM},
 month = nov,
 doi = {10.1145/1180875.1180916},
-pdf = {https://hal.inria.fr/file/index/docid/108523/filename/OsterCSCW06.pdf}
+pdf = {https://hal.inria.fr/file/index/docid/108523/filename/OsterCSCW06.pdf},
+keywords = {text-editing, WOOT}
 }
 
 % WOOTO
 @inproceedings{Weiss2007Wooki,
 author = {Weiss, St{\'e}phane and Urso, Pascal and Molli, Pascal},
-title = {Wooki: A {P2P} Wiki-Based Collaborative Writing Tool},
+title = {{Wooki}: A {P2P} Wiki-Based Collaborative Writing Tool},
 booktitle = {8th International Conference on Web Information Systems Engineering},
 series = {WISE 2007},
 year = {2007},
@@ -216,7 +231,8 @@ @inproceedings{Weiss2007Wooki
 publisher = {Springer LNCS volume 4831},
 month = dec,
 doi = {10.1007/978-3-540-76993-4_42},
-pdf = {http://pagesperso.lina.univ-nantes.fr/~molli-p/pmwiki/uploads/Main/weiss07.pdf}
+pdf = {http://pagesperso.lina.univ-nantes.fr/~molli-p/pmwiki/uploads/Main/weiss07.pdf},
+keywords = {text-editing, WOOT}
 }
 
 % Detailed specification and analysis of WOOT CRDT
@@ -228,7 +244,8 @@ @techreport{Oster2005WOOT
 month = may,
 institution = {INRIA},
 type = {Research Report},
-url = {https://hal.inria.fr/inria-00071240/document}
+url = {https://hal.inria.fr/inria-00071240/document},
+keywords = {text-editing, WOOT}
 }
 
 % Treedoc
@@ -241,8 +258,9 @@ @inproceedings{Preguica2009Treedoc
 pages = {395--403},
 publisher = {IEEE},
 doi = {10.1109/ICDCS.2009.20},
-pdf = {http://dx.doi.org/10.1109/ICDCS.2009.20}
-} 
+pdf = {http://dx.doi.org/10.1109/ICDCS.2009.20},
+keywords = {text-editing, Treedoc}
+}
 
 % Logoot
 @inproceedings{Weiss2009Logoot,
@@ -254,7 +272,8 @@ @inproceedings{Weiss2009Logoot
 pages = {404--412},
 publisher = {IEEE},
 doi = {10.1109/ICDCS.2009.75},
-pdf = {https://hal.inria.fr/inria-00432368/document}
+pdf = {https://hal.inria.fr/inria-00432368/document},
+keywords = {text-editing, Logoot}
 }
 
 % Logoot-Undo
@@ -270,7 +289,8 @@ @article{Weiss2010LogootUndo
 pages = {1162--1174},
 publisher = {IEEE},
 doi = {10.1109/TPDS.2009.173},
-pdf = {https://www.researchgate.net/profile/Pascal_Urso/publication/233882440_Logoot-Undo_Distributed_Collaborative_Editing_System/links/0fcfd50c84f5194937000000.pdf}
+pdf = {https://www.researchgate.net/profile/Pascal_Urso/publication/233882440_Logoot-Undo_Distributed_Collaborative_Editing_System/links/0fcfd50c84f5194937000000.pdf},
+keywords = {text-editing, Logoot, undo}
 }
 
 % RGA
@@ -286,7 +306,8 @@ @article{Roh2011RGA
 pages = {354--368},
 publisher = {Elsevier},
 doi = {10.1016/j.jpdc.2010.12.006},
-pdf = {http://csl.snu.ac.kr/papers/jpdc11.pdf}
+pdf = {http://csl.snu.ac.kr/papers/jpdc11.pdf},
+keywords = {text-editing, RGA}
 }
 
 % LSEQ
@@ -300,7 +321,8 @@ @inproceedings{Nedelec2013LSEQ
 publisher = {ACM},
 month = sep,
 doi = {10.1145/2494266.2494278},
-pdf = {https://hal.archives-ouvertes.fr/file/index/docid/921633/filename/fp025-nedelec.pdf}
+pdf = {https://hal.archives-ouvertes.fr/file/index/docid/921633/filename/fp025-nedelec.pdf},
+keywords = {text-editing, LSEQ}
 }
 
 @inproceedings{Nedelec2016CRATE,
@@ -313,7 +335,8 @@ @inproceedings{Nedelec2016CRATE
 publisher = {ACM},
 month = apr,
 doi = {10.1145/2872518.2890539},
-pdf = {https://hal.archives-ouvertes.fr/hal-01303333}
+pdf = {https://hal.archives-ouvertes.fr/hal-01303333},
+keywords = {text-editing, LSEQ}
 }
 
 @inproceedings{AhmedNacer2011evaluating,
@@ -326,7 +349,8 @@ @inproceedings{AhmedNacer2011evaluating
 publisher = {ACM},
 month = sep,
 doi = {10.1145/2034691.2034717},
-pdf = {https://hal.inria.fr/docs/00/62/95/03/PDF/doce63-ahmednacer.pdf}
+pdf = {https://hal.inria.fr/docs/00/62/95/03/PDF/doce63-ahmednacer.pdf},
+keywords = {text-editing}
 }
 
 % RGASplit and similar block-wise variants of other algorithms
@@ -340,7 +364,8 @@ @inproceedings{Briot2016group
 publisher = {ACM},
 month = nov,
 doi = {10.1145/2957276.2957300},
-pdf = {https://hal.inria.fr/hal-01343941/document}
+pdf = {https://hal.inria.fr/hal-01343941/document},
+keywords = {text-editing, RGASplit}
 }
 
 @inproceedings{Yu2015undo,
@@ -353,7 +378,8 @@ @inproceedings{Yu2015undo
 publisher = {Springer LNCS volume 9038},
 month = jun,
 doi = {10.1007/978-3-319-19129-4_16},
-pdf = {https://members.loria.fr/CIgnat/files/pdf/YuDAIS15.pdf}
+pdf = {https://members.loria.fr/CIgnat/files/pdf/YuDAIS15.pdf},
+keywords = {text-editing, undo}
 }
 
 % No open access version found
@@ -366,7 +392,8 @@ @inproceedings{Lv2016stringbased
 pages = {45--50},
 publisher = {IEEE},
 month = sep,
-doi = {10.1109/CSCWD.2016.7565961}
+doi = {10.1109/CSCWD.2016.7565961},
+keywords = {text-editing}
 }
 
 % Move operation for text
@@ -379,7 +406,8 @@ @inproceedings{AhmedNacer2013concurrency
 publisher = {ICST},
 month = oct,
 doi = {10.4108/icst.collaboratecom.2013.254113},
-pdf = {http://asc.di.fct.unl.pt/~nmp/pubs/collaboratecom-2013.pdf}
+pdf = {http://asc.di.fct.unl.pt/~nmp/pubs/collaboratecom-2013.pdf},
+keywords = {text-editing}
 }
 
 % YATA / Yjs
@@ -393,7 +421,8 @@ @inproceedings{Nicolaescu2016YATA
 publisher = {ACM},
 month = nov,
 doi = {10.1145/2957276.2957310},
-pdf = {https://www.researchgate.net/publication/310212186_Near_Real-Time_Peer-to-Peer_Shared_Editing_on_Extensible_Data_Types}
+pdf = {https://www.researchgate.net/publication/310212186_Near_Real-Time_Peer-to-Peer_Shared_Editing_on_Extensible_Data_Types},
+keywords = {text-editing, Yjs}
 }
 
 
@@ -409,7 +438,8 @@ @inproceedings{Martin2010xml
 publisher = {Springer LNCS volume 6426},
 month = oct,
 doi = {10.1007/978-3-642-16934-2_37},
-eprint = {1010.3615}
+eprint = {1010.3615},
+keywords = {trees, undo}
 }
 
 @techreport{AhmedNacer2012filesystem,
@@ -422,7 +452,8 @@ @techreport{AhmedNacer2012filesystem
 publisher = {INRIA},
 type = {Research Report},
 eprint = {1207.5990},
-url = {https://hal.inria.fr/hal-00720681/}
+url = {https://hal.inria.fr/hal-00720681/},
+keywords = {trees}
 }
 
 @article{Kleppmann2017json,
@@ -435,7 +466,8 @@ @article{Kleppmann2017json
 pages = {2733--2746},
 month = apr,
 doi = {10.1109/TPDS.2017.2697382},
-eprint = {1608.03960}
+eprint = {1608.03960},
+keywords = {trees}
 }
 
 @inproceedings{Tao2015filesystems,
@@ -448,7 +480,8 @@ @inproceedings{Tao2015filesystems
 month = may,
 articleno = {10},
 doi = {10.1145/2757667.2757683},
-pdf = {https://pages.lip6.fr/Marc.Shapiro/papers/geodistr-FS-Systor-2015.pdf}
+pdf = {https://pages.lip6.fr/Marc.Shapiro/papers/geodistr-FS-Systor-2015.pdf},
+keywords = {trees}
 }
 
 @inproceedings{Najafzadeh2018filesystem,
@@ -461,7 +494,8 @@ @inproceedings{Najafzadeh2018filesystem
 publisher = {Springer LNCS volume 10747},
 month = jan,
 doi = {10.1007/978-3-319-73721-8_17},
-pdf = {https://pages.lip6.fr/Marc.Shapiro/papers/VMCAI-2018-filesys.pdf}
+pdf = {https://pages.lip6.fr/Marc.Shapiro/papers/VMCAI-2018-filesys.pdf},
+keywords = {trees}
 }
 
 
@@ -477,7 +511,8 @@ @inproceedings{Brown2014Riak
 articleno = {1},
 publisher = {ACM},
 doi = {10.1145/2596631.2596633},
-pdf = {https://pages.lip6.fr/syncfree/attachments/article/46/WP3-report.pdf#page=31}
+pdf = {https://pages.lip6.fr/syncfree/attachments/article/46/WP3-report.pdf#page=31},
+keywords = {systems, composition}
 }
 
 @inproceedings{Almeida2014decomposition,
@@ -488,7 +523,8 @@ @inproceedings{Almeida2014decomposition
 publisher = {ACM},
 articleno = {3},
 doi = {10.1145/2596631.2596634},
-pdf = {https://core.ac.uk/download/pdf/154274611.pdf}
+pdf = {https://core.ac.uk/download/pdf/154274611.pdf},
+keywords = {composition}
 }
 
 @inproceedings{AhmedNacer2014merging,
@@ -501,7 +537,8 @@ @inproceedings{AhmedNacer2014merging
 articleno = {9},
 publisher = {ACM},
 doi = {10.1145/2596631.2596636},
-pdf = {https://hal.inria.fr/file/index/docid/957167/filename/main.pdf}
+pdf = {https://hal.inria.fr/file/index/docid/957167/filename/main.pdf},
+keywords = {text-editing}
 }
 
 @inproceedings{Meiklejohn2014composability,
@@ -513,7 +550,8 @@ @inproceedings{Meiklejohn2014composability
 articleno = {13},
 publisher = {ACM},
 doi = {10.1145/2596631.2596635},
-pdf = {https://pages.lip6.fr/syncfree/attachments/article/46/WP3-report.pdf#page=34}
+pdf = {https://pages.lip6.fr/syncfree/attachments/article/46/WP3-report.pdf#page=34},
+keywords = {composition}
 }
 
 @inproceedings{Grishchenko2014oplogs,
@@ -526,7 +564,8 @@ @inproceedings{Grishchenko2014oplogs
 articleno = {8},
 publisher = {ACM},
 doi = {10.1145/2596631.2596641},
-url = {http://www.ds.ewi.tudelft.nl/~victor/polo.pdf}
+url = {http://www.ds.ewi.tudelft.nl/~victor/polo.pdf},
+keywords = {text-editing, operation-based}
 }
 
 % PaPoC 2015
@@ -543,7 +582,8 @@ @inproceedings{Navalho2015computations
 articleno = {1},
 publisher = {ACM},
 doi = {10.1145/2745947.2745948},
-pdf = {http://asc.di.fct.unl.pt/~nmp/pubs/papoc-2015-1.pdf}
+pdf = {http://asc.di.fct.unl.pt/~nmp/pubs/papoc-2015-1.pdf},
+keywords = {computation}
 }
 
 @inproceedings{Holt2015claret,
@@ -556,7 +596,8 @@ @inproceedings{Holt2015claret
 articleno = {4},
 publisher = {ACM},
 doi = {10.1145/2745947.2745951},
-pdf = {http://irenezhang.net/papers/claret-papoc15.pdf}
+pdf = {http://irenezhang.net/papers/claret-papoc15.pdf},
+keywords = {transactions, systems},
 }
 
 % Associated master's thesis: https://www.dropbox.com/s/t0cyzfvmah9cldw/Master%20Thesis%20-%20Santiago%20Casti%C3%B1eira.pdf
@@ -569,7 +610,8 @@ @inproceedings{Castineira2015offline
 month = apr,
 articleno = {5},
 publisher = {ACM},
-doi = {10.1145/2745947.2745952}
+doi = {10.1145/2745947.2745952},
+keywords = {systems}
 }
 
 @inproceedings{10.1145/2745947.2745954,
@@ -582,7 +624,8 @@ @inproceedings{10.1145/2745947.2745954
 articleno = {7},
 publisher = {ACM},
 doi = {10.1145/2745947.2745954},
-url = {https://www.info.ucl.ac.be/~pvr/papoc-2015-lasp-abstract.pdf}
+url = {https://www.info.ucl.ac.be/~pvr/papoc-2015-lasp-abstract.pdf},
+keywords = {computation}
 }
 
 
@@ -600,7 +643,8 @@ @inproceedings{10.1145/2911151.2911156
 articleno = {5},
 publisher = {ACM},
 doi = {10.1145/2911151.2911156},
-eprint = {1605.06424}
+eprint = {1605.06424},
+keywords = {systems, composition}
 }
 
 @inproceedings{Zawirski2016register,
@@ -614,7 +658,8 @@ @inproceedings{Zawirski2016register
 publisher = {ACM},
 doi = {10.1145/2911151.2911157},
 url = {https://core.ac.uk/download/pdf/154274593.pdf},
-eprint = {1511.05010}
+eprint = {1511.05010},
+keywords = {state-based}
 }
 
 @inproceedings{Baquero2016embedded,
@@ -627,7 +672,8 @@ @inproceedings{Baquero2016embedded
 articleno = {10},
 publisher = {ACM},
 doi = {10.1145/2911151.2911159},
-url = {http://haslab.uminho.pt/cbm/files/abstractcounterpapocfinal.pdf}
+url = {http://haslab.uminho.pt/cbm/files/abstractcounterpapocfinal.pdf},
+keywords = {composition, counters}
 }
 
 % Replikativ
@@ -641,6 +687,7 @@ @inproceedings{Weilbach2016cdvcs
 articleno = {11},
 publisher = {ACM},
 doi = {10.1145/2911151.2911154},
+keywords = {systems, Replikativ}
 }
 
 @inproceedings{Akkoorath2016objects,
@@ -653,7 +700,8 @@ @inproceedings{Akkoorath2016objects
 articleno = {13},
 publisher = {ACM},
 doi = {10.1145/2911151.2911158},
-pdf = {https://softech.cs.uni-kl.de/homepage/publications/Akkoorath.Bieniusa2016.pdf}
+pdf = {https://softech.cs.uni-kl.de/homepage/publications/Akkoorath.Bieniusa2016.pdf},
+keywords = {shared-memory concurrency}
 }
 
 
@@ -671,7 +719,8 @@ @inproceedings{Younes2017resettable
 publisher = {ACM},
 articleno = {2},
 doi = {10.1145/3064889.3064892},
-pdf = {https://haslab.uminho.pt/cbm/files/a3-younes.pdf}
+pdf = {https://haslab.uminho.pt/cbm/files/a3-younes.pdf},
+keywords = {counters}
 }
 
 @inproceedings{Zeller2017Repliss,
@@ -684,7 +733,8 @@ @inproceedings{Zeller2017Repliss
 publisher = {ACM},
 articleno = {3},
 doi = {10.1145/3064889.3064893},
-pdf = {https://dl.acm.org/authorize?N37605}
+pdf = {https://dl.acm.org/authorize?N37605},
+keywords = {testing, verification}
 }
 
 @inproceedings{Enes2017borrowing,
@@ -696,7 +746,8 @@ @inproceedings{Enes2017borrowing
 month = apr,
 publisher = {ACM},
 doi = {10.1145/3064889.3064894},
-pdf = {https://haslab.uminho.pt/sites/default/files/cbm/files/a5-enes.pdf}
+pdf = {https://haslab.uminho.pt/sites/default/files/cbm/files/a5-enes.pdf},
+keywords = {counters}
 }
 
 
@@ -714,7 +765,8 @@ @inproceedings{Shapiro2018referential
 publisher = {ACM},
 articleno = {1},
 doi = {10.1145/3194261.3194262},
-pdf = {https://pages.lip6.fr/Marc.Shapiro/papers/causal-refs-papoc-2018-04.pdf}
+pdf = {https://pages.lip6.fr/Marc.Shapiro/papers/causal-refs-papoc-2018-04.pdf},
+keywords = {causal-consistency}
 }
 
 @inproceedings{Bauwens2018constraining,
@@ -727,7 +779,8 @@ @inproceedings{Bauwens2018constraining
 publisher = {ACM},
 articleno = {2},
 doi = {10.1145/3194261.3194263},
-pdf = {http://myter.be/papers/papoc18.pdf}
+pdf = {http://myter.be/papers/papoc18.pdf},
+keywords = {counters}
 }
 
 
@@ -744,7 +797,8 @@ @inproceedings{Leijnse2019higherorder
 publisher = {ACM},
 articleno = {5},
 doi = {10.1145/3301419.3323971},
-pdf = {https://repositorio.inesctec.pt/bitstream/123456789/10536/1/P-00Q-WJM.pdf}
+pdf = {https://repositorio.inesctec.pt/bitstream/123456789/10536/1/P-00Q-WJM.pdf},
+keywords = {composition}
 }
 
 @inproceedings{Kleppmann2019interleaving,
@@ -757,7 +811,8 @@ @inproceedings{Kleppmann2019interleaving
 publisher = {ACM},
 articleno = {6},
 doi = {10.1145/3301419.3323972},
-pdf = {https://martin.kleppmann.com/papers/interleaving-papoc19.pdf}
+pdf = {https://martin.kleppmann.com/papers/interleaving-papoc19.pdf},
+keywords = {text-editing}
 }
 
 @inproceedings{Mealha2019cloudEdge,
@@ -769,10 +824,11 @@ @inproceedings{Mealha2019cloudEdge
 month = mar,
 publisher = {ACM},
 articleno = {7},
-doi = {10.1145/3301419.3323973}
+doi = {10.1145/3301419.3323973},
+keywords = {systems}
 }
 
-@inproceedings{10.1145/3301419.3323974,
+@inproceedings{DePorre2019generic,
 author = {De Porre, Kevin and Myter, Florian and De Troyer, Christophe and Scholliers, Christophe and De Meuter, Wolfgang and Boix, Elisa Gonzalez},
 title = {A Generic Replicated Data Type for Strong Eventual Consistency},
 booktitle = {6th Workshop on Principles and Practice of Consistency for Distributed Data},
@@ -782,7 +838,8 @@ @inproceedings{10.1145/3301419.3323974
 publisher = {ACM},
 articleno = {8},
 doi = {10.1145/3301419.3323974},
-pdf = {http://soft.vub.ac.be/Publications/2019/vub-soft-tr-19-08.pdf}
+pdf = {http://soft.vub.ac.be/Publications/2019/vub-soft-tr-19-08.pdf},
+keywords = {text-editing, operation-based}
 }
 
 
@@ -798,7 +855,8 @@ @inproceedings{Preguica2014SwiftCloud
 month = oct,
 publisher = {IEEE},
 doi = {10.1109/SRDSW.2014.33},
-eprint = {1310.3107}
+eprint = {1310.3107},
+keywords = {systems, SwiftCloud}
 }
 
 % SwiftCloud
@@ -811,7 +869,8 @@ @inproceedings{Briquemont2015partial
 month = nov,
 publisher = {IEEE},
 doi = {10.1109/CloudCom.2015.81},
-url = {https://dial.uclouvain.be/pr/boreal/object/boreal%3A214300/datastream/PDF_01/view}
+url = {https://dial.uclouvain.be/pr/boreal/object/boreal%3A214300/datastream/PDF_01/view},
+keywords = {systems, SwiftCloud}
 }
 
 @inproceedings{Meiklejohn2015Lasp,
@@ -824,7 +883,8 @@ @inproceedings{Meiklejohn2015Lasp
 publisher = {ACM},
 pages = {184--195},
 doi = {10.1145/2790449.2790525},
-pdf = {https://www.info.ucl.ac.be/~pvr/ppdp-2015-cr.pdf}
+pdf = {https://www.info.ucl.ac.be/~pvr/ppdp-2015-cr.pdf},
+keywords = {computation, systems}
 }
 
 @inproceedings{Akkoorath2016Cure,
@@ -837,7 +897,8 @@ @inproceedings{Akkoorath2016Cure
 publisher = {IEEE},
 pages = {405--414},
 doi = {10.1109/ICDCS.2016.98},
-pdf = {https://pages.lip6.fr/Marc.Shapiro/papers/Cure-final-ICDCS16.pdf}
+pdf = {https://pages.lip6.fr/Marc.Shapiro/papers/Cure-final-ICDCS16.pdf},
+keywords = {systems}
 }
 
 @inproceedings{Jungnickel2017imap,
@@ -850,7 +911,8 @@ @inproceedings{Jungnickel2017imap
 publisher = {ACM},
 articleno = {1},
 doi = {10.1145/3064889.3064891},
-pdf = {http://www.redaktion.tu-berlin.de/fileadmin/a34331500/paper/papoc17-jungnickel.pdf}
+pdf = {http://www.redaktion.tu-berlin.de/fileadmin/a34331500/paper/papoc17-jungnickel.pdf},
+keywords = {systems}
 }
 
 @inproceedings{Chandramouli2018Faster,
@@ -863,7 +925,8 @@ @inproceedings{Chandramouli2018Faster
 publisher = {ACM},
 pages = {275--290},
 doi = {10.1145/3183713.3196898},
-pdf = {https://www.microsoft.com/en-us/research/uploads/prod/2018/03/faster-sigmod18.pdf}
+pdf = {https://www.microsoft.com/en-us/research/uploads/prod/2018/03/faster-sigmod18.pdf},
+keywords = {systems}
 }
 
 @inproceedings{Yu2017disturbance,
@@ -876,7 +939,22 @@ @inproceedings{Yu2017disturbance
 publisher = {Springer LNCS volume 10451},
 pages = {39--47},
 doi = {10.1007/978-3-319-66805-5_5},
-pdf = {https://hal.inria.fr/hal-01652656/document}
+pdf = {https://hal.inria.fr/hal-01652656/document},
+keywords = {systems, usability}
+}
+
+@inproceedings{Kleppmann2019localfirst,
+author = {Kleppmann, Martin and Wiggins, Adam and van Hardenberg, Peter and McGranaghan, Mark},
+title = {Local-First Software: You own your data, in spite of the cloud},
+booktitle = {ACM SIGPLAN International Symposium on New Ideas, New Paradigms, and Reflections on Programming and Software},
+series = {Onward! 2019},
+year = {2019},
+month = oct,
+publisher = {ACM},
+pages = {154--178},
+doi = {10.1145/3359591.3359737},
+pdf = {https://martin.kleppmann.com/papers/local-first.pdf},
+keywords = {systems, usability}
 }
 
 
@@ -888,7 +966,8 @@ @article{Almeida2013counters
 year = {2013},
 month = jul,
 eprint = {1307.3207},
-url = {https://arxiv.org/abs/1307.3207}
+url = {https://arxiv.org/abs/1307.3207},
+keywords = {counters}
 }
 
 @mastersthesis{Enes2017sync,
@@ -897,7 +976,8 @@ @mastersthesis{Enes2017sync
 school = {Universidade do Minho},
 year = {2017},
 month = nov,
-url = {https://vitorenes.org/page/other/msc-thesis.pdf}
+url = {https://vitorenes.org/page/other/msc-thesis.pdf},
+keywords = {state-based}
 }
 
 % bounded counter crdt
@@ -911,7 +991,8 @@ @inproceedings{Balegas2015invariants
 publisher = {IEEE},
 pages = {31--36},
 doi = {10.1109/SRDS.2015.32},
-eprint = {1503.09052}
+eprint = {1503.09052},
+keywords = {counters}
 }
 
 @inproceedings{Navalho2013stream,
@@ -925,7 +1006,8 @@ @inproceedings{Navalho2013stream
 publisher = {ACM},
 pages = {31--36},
 doi = {10.1145/2460756.2460762},
-pdf = {https://pages.lip6.fr/Marc.Shapiro/papers/computational-CRDTs-CloudDP-2013.pdf}
+pdf = {https://pages.lip6.fr/Marc.Shapiro/papers/computational-CRDTs-CloudDP-2013.pdf},
+keywords = {computation}
 }
 
 @inproceedings{Bieniusa2012sets,
@@ -938,7 +1020,8 @@ @inproceedings{Bieniusa2012sets
 publisher = {Springer LNCS volume 7611},
 pages = {441--442},
 doi = {10.1007/978-3-642-33651-5_48},
-url = {https://pages.lip6.fr/Marc.Shapiro/papers/semantics-sets-BA-DISC-2012.pdf}
+url = {https://pages.lip6.fr/Marc.Shapiro/papers/semantics-sets-BA-DISC-2012.pdf},
+keywords = {set-crdt, specification}
 }
 
 @techreport{Bieniusa2012optimized,
@@ -950,7 +1033,8 @@ @techreport{Bieniusa2012optimized
 year = {2012},
 month = oct,
 eprint = {1210.3368},
-pdf = {http://hal.inria.fr/hal-00738680/PDF/RR-8083.pdf}
+pdf = {http://hal.inria.fr/hal-00738680/PDF/RR-8083.pdf},
+keywords = {set-crdt}
 }
 
 @inproceedings{Nicolaescu2015Yjs,
@@ -963,7 +1047,8 @@ @inproceedings{Nicolaescu2015Yjs
 publisher = {Springer LNCS volume 9114},
 pages = {675--678},
 doi = {10.1007/978-3-319-19890-3_55},
-url = {http://dbis.rwth-aachen.de/~derntl/papers/preprints/icwe2015-preprint.pdf}
+url = {http://dbis.rwth-aachen.de/~derntl/papers/preprints/icwe2015-preprint.pdf},
+keywords = {systems, Yjs}
 }
 
 @article{Lv2018CAD,
@@ -975,7 +1060,8 @@ @article{Lv2018CAD
 volume = {38},
 pages = {381--391},
 publisher = {Elsevier},
-doi = {10.1016/j.aei.2018.08.008}
+doi = {10.1016/j.aei.2018.08.008},
+keywords = {systems}
 }
 
 
@@ -991,7 +1077,8 @@ @incollection{Zeller2014verification
 pages = {33--48},
 publisher = {Springer LNCS volume 8461},
 doi = {10.1007/978-3-662-43613-4_3},
-url = {https://softech.cs.uni-kl.de/homepage/publications/Zeller.Bieniusa.Poetzsch-Heffter.Forte2014.pdf}
+url = {https://softech.cs.uni-kl.de/homepage/publications/Zeller.Bieniusa.Poetzsch-Heffter.Forte2014.pdf},
+keywords = {specification, verification}
 }
 
 @article{Gomes2017verifying,
@@ -1004,7 +1091,8 @@ @article{Gomes2017verifying
 month = oct,
 publisher = {ACM},
 doi = {10.1145/3133933},
-eprint = {1707.01747}
+eprint = {1707.01747},
+keywords = {specification, verification}
 }
 
 @inproceedings{Burckhardt2014specification,
@@ -1017,7 +1105,8 @@ @inproceedings{Burckhardt2014specification
 publisher = {ACM},
 pages = {271--284},
 doi = {10.1145/2535838.2535848},
-pdf = {http://software.imdea.org/~gotsman/papers/distrmm-popl14-ext.pdf}
+pdf = {http://software.imdea.org/~gotsman/papers/distrmm-popl14-ext.pdf},
+keywords = {specification, verification}
 }
 
 @article{Kleppmann2018OpSets,
@@ -1026,7 +1115,8 @@ @article{Kleppmann2018OpSets
 year = {2018},
 month = may,
 eprint = {1805.04263},
-url = {https://arxiv.org/abs/1805.04263}
+url = {https://arxiv.org/abs/1805.04263},
+keywords = {specification, verification}
 }
 
 @inproceedings{Gotsman2016CISE,
@@ -1040,7 +1130,8 @@ @inproceedings{Gotsman2016CISE
 pages = {371--384},
 numpages = {14},
 doi = {10.1145/2837614.2837625},
-pdf = {http://software.imdea.org/~gotsman/papers/logic-popl16.pdf}
+pdf = {http://software.imdea.org/~gotsman/papers/logic-popl16.pdf},
+keywords = {specification, verification}
 }
 
 @inproceedings{Attiya2016text,
@@ -1053,7 +1144,8 @@ @inproceedings{Attiya2016text
 publisher = {ACM},
 pages = {259--268},
 doi = {10.1145/2933057.2933090},
-pdf = {http://www.cs.ox.ac.uk/people/hongseok.yang/paper/podc16-full.pdf}
+pdf = {http://www.cs.ox.ac.uk/people/hongseok.yang/paper/podc16-full.pdf},
+keywords = {text-editing, specification, verification}
 }
 
 % safety analysis
@@ -1066,7 +1158,40 @@ @inproceedings{Li2014Sieve
 month = jun,
 publisher = {USENIX},
 pages = {281--292},
-url = {https://www.usenix.org/conference/atc14/technical-sessions/presentation/li_cheng_2}
+url = {https://www.usenix.org/conference/atc14/technical-sessions/presentation/li_cheng_2},
+keywords = {verification}
+}
+
+
+% Security and privacy of CRDTs
+
+@article{Kollmann2019Snapdoc,
+author = {Kollmann, Stephan A and Kleppmann, Martin and Beresford, Alastair R},
+title = {{Snapdoc}: Authenticated snapshots with history privacy in peer-to-peer collaborative editing},
+journal = {Proceedings on Privacy Enhancing Technologies (PoPETS)},
+volume = {2019},
+number = {3},
+pages = {210--232},
+year = {2019},
+month = jul,
+publisher = {De Gruyter},
+doi = {10.2478/popets-2019-0044},
+pdf = {https://www.petsymposium.org/2019/files/papers/issue3/popets-2019-0044.pdf},
+keywords = {security}
+}
+
+@inproceedings{Truong2012authenticating,
+author = {Truong, Hien Thi Thu and Ignat, Claudia-Lavinia and Molli, Pascal},
+title = {Authenticating operation-based history in collaborative systems},
+booktitle = {17th ACM International Conference on Supporting Group Work},
+series = {GROUP 2012},
+year = {2012},
+month = oct,
+pages = {131--140},
+publisher = {ACM},
+doi = {10.1145/2389176.2389197},
+url = {https://hal.inria.fr/hal-00761045/document},
+keywords = {security}
 }
 
 
@@ -1083,7 +1208,8 @@ @inproceedings{Conway2012lattices
 articleno = {1},
 pages = {1--14},
 doi = {10.1145/2391229.2391230},
-pdf = {https://www2.eecs.berkeley.edu/Pubs/TechRpts/2012/EECS-2012-167.pdf}
+pdf = {https://www2.eecs.berkeley.edu/Pubs/TechRpts/2012/EECS-2012-167.pdf},
+keywords = {crdt-related}
 }
 
 @inproceedings{Burckhardt2012CloudTypes,
@@ -1096,7 +1222,8 @@ @inproceedings{Burckhardt2012CloudTypes
 pages = {283--307},
 publisher = {Springer LNCS volume 7313},
 doi = {10.1007/978-3-642-31057-7_14},
-url = {https://www.microsoft.com/en-us/research/wp-content/uploads/2016/02/final-with-color.pdf}
+url = {https://www.microsoft.com/en-us/research/wp-content/uploads/2016/02/final-with-color.pdf},
+keywords = {crdt-related}
 }
 
 @inproceedings{Burckhardt2012transactions,
@@ -1109,7 +1236,8 @@ @inproceedings{Burckhardt2012transactions
 publisher = {Springer LNCS volume 7211},
 pages = {67--86},
 doi = {10.1007/978-3-642-28869-2_4},
-pdf = {https://www.microsoft.com/en-us/research/wp-content/uploads/2016/02/ecr-esop2012.pdf}
+pdf = {https://www.microsoft.com/en-us/research/wp-content/uploads/2016/02/ecr-esop2012.pdf},
+keywords = {crdt-related, transactions}
 }
 
 @article{Kaki2019mergeable,
@@ -1122,7 +1250,8 @@ @article{Kaki2019mergeable
 month = oct,
 publisher = {ACM},
 doi = {10.1145/3360580},
-url = {https://gowthamk.github.io/docs/mrdt.pdf}
+url = {https://gowthamk.github.io/docs/mrdt.pdf},
+keywords = {crdt-related}
 }
 
 @inproceedings{Kuper2014LVars,
@@ -1132,5 +1261,6 @@ @inproceedings{Kuper2014LVars
 series = {WoDet 2014},
 year = {2014},
 month = mar,
-url = {http://wodet.cs.washington.edu/wp-content/uploads/2014/02/wodet2014-final1.pdf}
+url = {http://wodet.cs.washington.edu/wp-content/uploads/2014/02/wodet2014-final1.pdf},
+keywords = {crdt-related, shared-memory concurrency}
 }
diff --git a/papers.html b/papers.html
index 3a72234..28c03db 100644
--- a/papers.html
+++ b/papers.html
@@ -9,6 +9,81 @@
      bibtex2html --dl --nodoc --title "CRDT Papers" papers.bib  -->
 
 <h1>CRDT Papers</h1>
+<p>This page contains a comprehensive list of research publications on CRDTs.
+The data is available <a href="papers_bib.html">in BibTeX format</a>.
+If you have anything to add or correct, please
+<a href="https://github.com/ept/crdt-website/edit/master/papers.bib">edit the file on GitHub</a>
+and send us a pull request.</p>
+
+<p><strong>Select checkboxes to filter papers by topic:</strong></p>
+<form id="papers-filter">
+    <input type="checkbox" id="introduction" name="introduction">
+    <label for="introduction">Introductions to CRDTs</label><br>
+
+    <input type="checkbox" id="systems" name="systems">
+    <label for="systems">Systems and apps using CRDTs</label><br>
+
+    <input type="checkbox" id="operation-based" name="operation-based">
+    <label for="operation-based">Operation-based CRDTs</label><br>
+
+    <input type="checkbox" id="state-based" name="state-based">
+    <label for="state-based">State-based and Delta CRDTs</label><br>
+
+    <input type="checkbox" id="counters" name="counters">
+    <label for="counters">Counter CRDTs</label><br>
+
+    <input type="checkbox" id="text-editing" name="text-editing">
+    <label for="text-editing">Text editing/sequence CRDTs</label><br>
+
+    <input type="checkbox" id="undo" name="undo">
+    <label for="undo">Undoing operations</label><br>
+
+    <input type="checkbox" id="trees" name="trees">
+    <label for="trees">CRDTs for trees</label><br>
+
+    <input type="checkbox" id="computation" name="computation">
+    <label for="computation">Computation/programming</label><br>
+
+    <input type="checkbox" id="composition" name="composition">
+    <label for="composition">Composing CRDTs</label><br>
+
+    <input type="checkbox" id="verification" name="verification">
+    <label for="verification">Specification and verification</label><br>
+
+    <input type="checkbox" id="crdt-related" name="crdt-related">
+    <label for="crdt-related">Close relatives of CRDTs</label><br>
+</form>
+
+<script>
+const checkboxes = document.querySelectorAll('form#papers-filter input[type="checkbox"]')
+
+for (let checkbox of checkboxes) {
+    checkbox.addEventListener('change', () => {
+        let selected = []
+        for (let cb of checkboxes) {
+            if (cb.checked) selected.push(cb.name)
+        }
+
+        const regex = new RegExp(selected.join('|'))
+
+        for (let element of document.querySelectorAll('div.td-content > dl > dd')) {
+            let keywords = element.querySelector('blockquote')
+            let previous = element
+            do {
+                previous = previous.previousSibling
+            } while (previous.nodeType !== Node.ELEMENT_NODE || previous.tagName !== 'DT')
+
+            if (selected.length === 0 || (keywords && regex.test(keywords.innerText))) {
+                previous.className = 'selected'
+            } else {
+                previous.className = 'unselected'
+            }
+        }
+    })
+}
+</script>
+
+<h2>Paper List</h2>
 <dl>
 
 <dt>
@@ -23,6 +98,9 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#Shapiro2011CRDTs">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1007/978-3-642-24550-3_29">DOI</a>&nbsp;| 
 <a href="https://pages.lip6.fr/Marek.Zawirski/papers/RR-7687.pdf">.pdf</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: introduction
+</font></blockquote>
 
 </dd>
 
@@ -37,6 +115,9 @@ <h1>CRDT Papers</h1>
  Research Report 7506, INRIA, January 2011.
 [&nbsp;<a href="papers_bib.html#Shapiro2011comprehensive">bib</a>&nbsp;| 
 <a href="http://hal.inria.fr/inria-00555588/">http</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: introduction
+</font></blockquote>
 
 </dd>
 
@@ -51,6 +132,9 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#Letia2010consistency">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1145/1773912.1773921">DOI</a>&nbsp;| 
 <a href="http://asc.di.fct.unl.pt/~nmp/pubs/osr-2010.pdf">.pdf</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: introduction
+</font></blockquote>
 
 </dd>
 
@@ -66,6 +150,9 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#Burckhardt2014principles">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1561/2500000011">DOI</a>&nbsp;| 
 <a href="https://www.nowpublishers.com/article/Download/PGL-011">http</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: introduction
+</font></blockquote>
 
 </dd>
 
@@ -80,6 +167,9 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#Preguica2018encyclopedia">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1007/978-3-319-63962-8_185-1">DOI</a>&nbsp;| 
 <a href="http://arxiv.org/abs/1805.06358">arXiv</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: introduction
+</font></blockquote>
 
 </dd>
 
@@ -94,6 +184,9 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#Preguica2018crdts">bib</a>&nbsp;| 
 <a href="http://arxiv.org/abs/1806.10254">arXiv</a>&nbsp;| 
 <a href="https://arxiv.org/abs/1806.10254">http</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: introduction
+</font></blockquote>
 
 </dd>
 
@@ -111,6 +204,9 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#Baquero2014opbased">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1007/978-3-662-43352-2_11">DOI</a>&nbsp;| 
 <a href="http://gsd.di.uminho.pt/members/cbm/ps/crdtOpsMiddleware.pdf">.pdf</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: operation-based
+</font></blockquote>
 
 </dd>
 
@@ -125,6 +221,9 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#Baquero2017pure">bib</a>&nbsp;| 
 <a href="http://arxiv.org/abs/1710.04469">arXiv</a>&nbsp;| 
 <a href="https://arxiv.org/abs/1710.04469">http</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: operation-based
+</font></blockquote>
 
 </dd>
 
@@ -138,6 +237,9 @@ <h1>CRDT Papers</h1>
  Technical report, HASLab, INESC TEC, May 2015.
 [&nbsp;<a href="papers_bib.html#Baquero2015composition">bib</a>&nbsp;| 
 <a href="http://haslab.uminho.pt/cbm/files/crdtcompositionreport.pdf">.pdf</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: state-based
+</font></blockquote>
 
 </dd>
 
@@ -153,6 +255,9 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#Almeida2015delta">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1007/978-3-319-26850-7_5">DOI</a>&nbsp;| 
 <a href="http://arxiv.org/abs/1410.2803">arXiv</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: state-based
+</font></blockquote>
 
 </dd>
 
@@ -168,6 +273,9 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#vanderLinde06delta">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1145/2911151.2911163">DOI</a>&nbsp;| 
 <a href="https://novasys.di.fct.unl.pt/~alinde/publications/a12-van_der_linde.pdf">.pdf</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: state-based
+</font></blockquote>
 
 </dd>
 
@@ -183,21 +291,27 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#Almeida2018delta">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1016/j.jpdc.2017.08.003">DOI</a>&nbsp;| 
 <a href="http://arxiv.org/abs/1603.01529">arXiv</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: state-based
+</font></blockquote>
 
 </dd>
 
 
 <dt>
-[<a name="Yu2020undo">13</a>]
+[<a name="Yu2019undo">13</a>]
 </dt>
 <dd>
 Weihai Yu, Victorien Elvinger, and Claudia-Lavinia Ignat.
  A generic undo support for state-based CRDTs.
  In <em>23rd International Conference on Principles of Distributed
-  Systems ()</em>, OPODIS 2019. Dagstuhl LIPIcs, November 2019.
-[&nbsp;<a href="papers_bib.html#Yu2020undo">bib</a>&nbsp;| 
+  Systems</em>, OPODIS 2019. Dagstuhl LIPIcs, November 2019.
+[&nbsp;<a href="papers_bib.html#Yu2019undo">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.4230/LIPIcs.OPODIS.2019.14">DOI</a>&nbsp;| 
 <a href="https://drops.dagstuhl.de/opus/volltexte/2020/11800/pdf/LIPIcs-OPODIS-2019-14.pdf">.pdf</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: state-based, undo
+</font></blockquote>
 
 </dd>
 
@@ -213,6 +327,9 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#Enes2019synchronization">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1109/ICDE.2019.00022">DOI</a>&nbsp;| 
 <a href="http://arxiv.org/abs/1803.02750">arXiv</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: state-based
+</font></blockquote>
 
 </dd>
 
@@ -228,6 +345,9 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#Oster2006WOOT">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1145/1180875.1180916">DOI</a>&nbsp;| 
 <a href="https://hal.inria.fr/file/index/docid/108523/filename/OsterCSCW06.pdf">.pdf</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: text-editing, WOOT
+</font></blockquote>
 
 </dd>
 
@@ -244,6 +364,9 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#Weiss2007Wooki">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1007/978-3-540-76993-4_42">DOI</a>&nbsp;| 
 <a href="http://pagesperso.lina.univ-nantes.fr/~molli-p/pmwiki/uploads/Main/weiss07.pdf">.pdf</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: text-editing, WOOT
+</font></blockquote>
 
 </dd>
 
@@ -257,6 +380,9 @@ <h1>CRDT Papers</h1>
  Research Report RR-5580, INRIA, May 2005.
 [&nbsp;<a href="papers_bib.html#Oster2005WOOT">bib</a>&nbsp;| 
 <a href="https://hal.inria.fr/inria-00071240/document">http</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: text-editing, WOOT
+</font></blockquote>
 
 </dd>
 
@@ -272,6 +398,9 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#Preguica2009Treedoc">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1109/ICDCS.2009.20">DOI</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1109/ICDCS.2009.20">http</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: text-editing, Treedoc
+</font></blockquote>
 
 </dd>
 
@@ -288,6 +417,9 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#Weiss2009Logoot">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1109/ICDCS.2009.75">DOI</a>&nbsp;| 
 <a href="https://hal.inria.fr/inria-00432368/document">http</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: text-editing, Logoot
+</font></blockquote>
 
 </dd>
 
@@ -304,6 +436,9 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#Weiss2010LogootUndo">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1109/TPDS.2009.173">DOI</a>&nbsp;| 
 <a href="https://www.researchgate.net/profile/Pascal_Urso/publication/233882440_Logoot-Undo_Distributed_Collaborative_Editing_System/links/0fcfd50c84f5194937000000.pdf">.pdf</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: text-editing, Logoot, undo
+</font></blockquote>
 
 </dd>
 
@@ -320,6 +455,9 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#Roh2011RGA">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1016/j.jpdc.2010.12.006">DOI</a>&nbsp;| 
 <a href="http://csl.snu.ac.kr/papers/jpdc11.pdf">.pdf</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: text-editing, RGA
+</font></blockquote>
 
 </dd>
 
@@ -336,6 +474,9 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#Nedelec2013LSEQ">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1145/2494266.2494278">DOI</a>&nbsp;| 
 <a href="https://hal.archives-ouvertes.fr/file/index/docid/921633/filename/fp025-nedelec.pdf">.pdf</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: text-editing, LSEQ
+</font></blockquote>
 
 </dd>
 
@@ -351,6 +492,9 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#Nedelec2016CRATE">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1145/2872518.2890539">DOI</a>&nbsp;| 
 <a href="https://hal.archives-ouvertes.fr/hal-01303333">http</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: text-editing, LSEQ
+</font></blockquote>
 
 </dd>
 
@@ -367,6 +511,9 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#AhmedNacer2011evaluating">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1145/2034691.2034717">DOI</a>&nbsp;| 
 <a href="https://hal.inria.fr/docs/00/62/95/03/PDF/doce63-ahmednacer.pdf">.pdf</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: text-editing
+</font></blockquote>
 
 </dd>
 
@@ -382,6 +529,9 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#Briot2016group">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1145/2957276.2957300">DOI</a>&nbsp;| 
 <a href="https://hal.inria.fr/hal-01343941/document">http</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: text-editing, RGASplit
+</font></blockquote>
 
 </dd>
 
@@ -398,6 +548,9 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#Yu2015undo">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1007/978-3-319-19129-4_16">DOI</a>&nbsp;| 
 <a href="https://members.loria.fr/CIgnat/files/pdf/YuDAIS15.pdf">.pdf</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: text-editing, undo
+</font></blockquote>
 
 </dd>
 
@@ -413,6 +566,9 @@ <h1>CRDT Papers</h1>
   Cooperative Work in Design</em>, CSCWD 2016, pages 45--50. IEEE, September 2016.
 [&nbsp;<a href="papers_bib.html#Lv2016stringbased">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1109/CSCWD.2016.7565961">DOI</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: text-editing
+</font></blockquote>
 
 </dd>
 
@@ -429,6 +585,9 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#AhmedNacer2013concurrency">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.4108/icst.collaboratecom.2013.254113">DOI</a>&nbsp;| 
 <a href="http://asc.di.fct.unl.pt/~nmp/pubs/collaboratecom-2013.pdf">.pdf</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: text-editing
+</font></blockquote>
 
 </dd>
 
@@ -444,6 +603,9 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#Nicolaescu2016YATA">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1145/2957276.2957310">DOI</a>&nbsp;| 
 <a href="https://www.researchgate.net/publication/310212186_Near_Real-Time_Peer-to-Peer_Shared_Editing_on_Extensible_Data_Types">http</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: text-editing, Yjs
+</font></blockquote>
 
 </dd>
 
@@ -459,6 +621,9 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#Martin2010xml">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1007/978-3-642-16934-2_37">DOI</a>&nbsp;| 
 <a href="http://arxiv.org/abs/1010.3615">arXiv</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: trees, undo
+</font></blockquote>
 
 </dd>
 
@@ -473,6 +638,9 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#AhmedNacer2012filesystem">bib</a>&nbsp;| 
 <a href="http://arxiv.org/abs/1207.5990">arXiv</a>&nbsp;| 
 <a href="https://hal.inria.fr/hal-00720681/">http</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: trees
+</font></blockquote>
 
 </dd>
 
@@ -488,6 +656,9 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#Kleppmann2017json">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1109/TPDS.2017.2697382">DOI</a>&nbsp;| 
 <a href="http://arxiv.org/abs/1608.03960">arXiv</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: trees
+</font></blockquote>
 
 </dd>
 
@@ -504,6 +675,9 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#Tao2015filesystems">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1145/2757667.2757683">DOI</a>&nbsp;| 
 <a href="https://pages.lip6.fr/Marc.Shapiro/papers/geodistr-FS-Systor-2015.pdf">.pdf</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: trees
+</font></blockquote>
 
 </dd>
 
@@ -520,6 +694,9 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#Najafzadeh2018filesystem">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1007/978-3-319-73721-8_17">DOI</a>&nbsp;| 
 <a href="https://pages.lip6.fr/Marc.Shapiro/papers/VMCAI-2018-filesys.pdf">.pdf</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: trees
+</font></blockquote>
 
 </dd>
 
@@ -535,6 +712,9 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#Brown2014Riak">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1145/2596631.2596633">DOI</a>&nbsp;| 
 <a href="https://pages.lip6.fr/syncfree/attachments/article/46/WP3-report.pdf#page=31">http</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: systems, composition
+</font></blockquote>
 
 </dd>
 
@@ -551,6 +731,9 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#Almeida2014decomposition">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1145/2596631.2596634">DOI</a>&nbsp;| 
 <a href="https://core.ac.uk/download/pdf/154274611.pdf">.pdf</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: composition
+</font></blockquote>
 
 </dd>
 
@@ -566,6 +749,9 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#AhmedNacer2014merging">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1145/2596631.2596636">DOI</a>&nbsp;| 
 <a href="https://hal.inria.fr/file/index/docid/957167/filename/main.pdf">.pdf</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: text-editing
+</font></blockquote>
 
 </dd>
 
@@ -582,6 +768,9 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#Meiklejohn2014composability">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1145/2596631.2596635">DOI</a>&nbsp;| 
 <a href="https://pages.lip6.fr/syncfree/attachments/article/46/WP3-report.pdf#page=34">http</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: composition
+</font></blockquote>
 
 </dd>
 
@@ -597,6 +786,9 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#Grishchenko2014oplogs">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1145/2596631.2596641">DOI</a>&nbsp;| 
 <a href="http://www.ds.ewi.tudelft.nl/~victor/polo.pdf">.pdf</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: text-editing, operation-based
+</font></blockquote>
 
 </dd>
 
@@ -612,6 +804,9 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#Navalho2015computations">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1145/2745947.2745948">DOI</a>&nbsp;| 
 <a href="http://asc.di.fct.unl.pt/~nmp/pubs/papoc-2015-1.pdf">.pdf</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: computation
+</font></blockquote>
 
 </dd>
 
@@ -628,6 +823,9 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#Holt2015claret">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1145/2745947.2745951">DOI</a>&nbsp;| 
 <a href="http://irenezhang.net/papers/claret-papoc15.pdf">.pdf</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: transactions, systems
+</font></blockquote>
 
 </dd>
 
@@ -643,6 +841,9 @@ <h1>CRDT Papers</h1>
   Distributed Data</em>, PaPoC 2015. ACM, April 2015.
 [&nbsp;<a href="papers_bib.html#Castineira2015offline">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1145/2745947.2745952">DOI</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: systems
+</font></blockquote>
 
 </dd>
 
@@ -659,6 +860,9 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#10.1145/2745947.2745954">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1145/2745947.2745954">DOI</a>&nbsp;| 
 <a href="https://www.info.ucl.ac.be/~pvr/papoc-2015-lasp-abstract.pdf">.pdf</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: computation
+</font></blockquote>
 
 </dd>
 
@@ -674,6 +878,9 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#10.1145/2911151.2911156">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1145/2911151.2911156">DOI</a>&nbsp;| 
 <a href="http://arxiv.org/abs/1605.06424">arXiv</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: systems, composition
+</font></blockquote>
 
 </dd>
 
@@ -691,6 +898,9 @@ <h1>CRDT Papers</h1>
 <a href="http://dx.doi.org/10.1145/2911151.2911157">DOI</a>&nbsp;| 
 <a href="http://arxiv.org/abs/1511.05010">arXiv</a>&nbsp;| 
 <a href="https://core.ac.uk/download/pdf/154274593.pdf">.pdf</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: state-based
+</font></blockquote>
 
 </dd>
 
@@ -706,6 +916,9 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#Baquero2016embedded">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1145/2911151.2911159">DOI</a>&nbsp;| 
 <a href="http://haslab.uminho.pt/cbm/files/abstractcounterpapocfinal.pdf">.pdf</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: composition, counters
+</font></blockquote>
 
 </dd>
 
@@ -720,6 +933,9 @@ <h1>CRDT Papers</h1>
   for Distributed Data</em>, PaPoC 2016. ACM, April 2016.
 [&nbsp;<a href="papers_bib.html#Weilbach2016cdvcs">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1145/2911151.2911154">DOI</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: systems, Replikativ
+</font></blockquote>
 
 </dd>
 
@@ -735,6 +951,9 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#Akkoorath2016objects">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1145/2911151.2911158">DOI</a>&nbsp;| 
 <a href="https://softech.cs.uni-kl.de/homepage/publications/Akkoorath.Bieniusa2016.pdf">.pdf</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: shared-memory concurrency
+</font></blockquote>
 
 </dd>
 
@@ -750,6 +969,9 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#Younes2017resettable">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1145/3064889.3064892">DOI</a>&nbsp;| 
 <a href="https://haslab.uminho.pt/cbm/files/a3-younes.pdf">.pdf</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: counters
+</font></blockquote>
 
 </dd>
 
@@ -765,6 +987,9 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#Zeller2017Repliss">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1145/3064889.3064893">DOI</a>&nbsp;| 
 <a href="https://dl.acm.org/authorize?N37605">http</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: testing, verification
+</font></blockquote>
 
 </dd>
 
@@ -781,6 +1006,9 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#Enes2017borrowing">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1145/3064889.3064894">DOI</a>&nbsp;| 
 <a href="https://haslab.uminho.pt/sites/default/files/cbm/files/a5-enes.pdf">.pdf</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: counters
+</font></blockquote>
 
 </dd>
 
@@ -796,6 +1024,9 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#Shapiro2018referential">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1145/3194261.3194262">DOI</a>&nbsp;| 
 <a href="https://pages.lip6.fr/Marc.Shapiro/papers/causal-refs-papoc-2018-04.pdf">.pdf</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: causal-consistency
+</font></blockquote>
 
 </dd>
 
@@ -811,6 +1042,9 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#Bauwens2018constraining">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1145/3194261.3194263">DOI</a>&nbsp;| 
 <a href="http://myter.be/papers/papoc18.pdf">.pdf</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: counters
+</font></blockquote>
 
 </dd>
 
@@ -826,6 +1060,9 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#Leijnse2019higherorder">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1145/3301419.3323971">DOI</a>&nbsp;| 
 <a href="https://repositorio.inesctec.pt/bitstream/123456789/10536/1/P-00Q-WJM.pdf">.pdf</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: composition
+</font></blockquote>
 
 </dd>
 
@@ -842,6 +1079,9 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#Kleppmann2019interleaving">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1145/3301419.3323972">DOI</a>&nbsp;| 
 <a href="https://martin.kleppmann.com/papers/interleaving-papoc19.pdf">.pdf</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: text-editing
+</font></blockquote>
 
 </dd>
 
@@ -856,12 +1096,15 @@ <h1>CRDT Papers</h1>
   Distributed Data</em>, PaPoC 2019. ACM, March 2019.
 [&nbsp;<a href="papers_bib.html#Mealha2019cloudEdge">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1145/3301419.3323973">DOI</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: systems
+</font></blockquote>
 
 </dd>
 
 
 <dt>
-[<a name="10.1145/3301419.3323974">57</a>]
+[<a name="DePorre2019generic">57</a>]
 </dt>
 <dd>
 Kevin De&nbsp;Porre, Florian Myter, Christophe De&nbsp;Troyer, Christophe Scholliers,
@@ -869,9 +1112,12 @@ <h1>CRDT Papers</h1>
  A generic replicated data type for strong eventual consistency.
  In <em>6th Workshop on Principles and Practice of Consistency for
   Distributed Data</em>, PaPoC 2019. ACM, March 2019.
-[&nbsp;<a href="papers_bib.html#10.1145/3301419.3323974">bib</a>&nbsp;| 
+[&nbsp;<a href="papers_bib.html#DePorre2019generic">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1145/3301419.3323974">DOI</a>&nbsp;| 
 <a href="http://soft.vub.ac.be/Publications/2019/vub-soft-tr-19-08.pdf">.pdf</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: text-editing, operation-based
+</font></blockquote>
 
 </dd>
 
@@ -889,6 +1135,9 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#Preguica2014SwiftCloud">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1109/SRDSW.2014.33">DOI</a>&nbsp;| 
 <a href="http://arxiv.org/abs/1310.3107">arXiv</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: systems, SwiftCloud
+</font></blockquote>
 
 </dd>
 
@@ -904,6 +1153,9 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#Briquemont2015partial">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1109/CloudCom.2015.81">DOI</a>&nbsp;| 
 <a href="https://dial.uclouvain.be/pr/boreal/object/boreal%3A214300/datastream/PDF_01/view">http</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: systems, SwiftCloud
+</font></blockquote>
 
 </dd>
 
@@ -919,6 +1171,9 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#Meiklejohn2015Lasp">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1145/2790449.2790525">DOI</a>&nbsp;| 
 <a href="https://www.info.ucl.ac.be/~pvr/ppdp-2015-cr.pdf">.pdf</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: computation, systems
+</font></blockquote>
 
 </dd>
 
@@ -935,6 +1190,9 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#Akkoorath2016Cure">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1109/ICDCS.2016.98">DOI</a>&nbsp;| 
 <a href="https://pages.lip6.fr/Marc.Shapiro/papers/Cure-final-ICDCS16.pdf">.pdf</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: systems
+</font></blockquote>
 
 </dd>
 
@@ -950,6 +1208,9 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#Jungnickel2017imap">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1145/3064889.3064891">DOI</a>&nbsp;| 
 <a href="http://www.redaktion.tu-berlin.de/fileadmin/a34331500/paper/papoc17-jungnickel.pdf">.pdf</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: systems
+</font></blockquote>
 
 </dd>
 
@@ -966,6 +1227,9 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#Chandramouli2018Faster">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1145/3183713.3196898">DOI</a>&nbsp;| 
 <a href="https://www.microsoft.com/en-us/research/uploads/prod/2018/03/faster-sigmod18.pdf">.pdf</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: systems
+</font></blockquote>
 
 </dd>
 
@@ -983,12 +1247,34 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#Yu2017disturbance">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1007/978-3-319-66805-5_5">DOI</a>&nbsp;| 
 <a href="https://hal.inria.fr/hal-01652656/document">http</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: systems, usability
+</font></blockquote>
+
+</dd>
+
+
+<dt>
+[<a name="Kleppmann2019localfirst">65</a>]
+</dt>
+<dd>
+Martin Kleppmann, Adam Wiggins, Peter van Hardenberg, and Mark McGranaghan.
+ Local-first software: You own your data, in spite of the cloud.
+ In <em>ACM SIGPLAN International Symposium on New Ideas, New
+  Paradigms, and Reflections on Programming and Software</em>, Onward! 2019, pages
+  154--178. ACM, October 2019.
+[&nbsp;<a href="papers_bib.html#Kleppmann2019localfirst">bib</a>&nbsp;| 
+<a href="http://dx.doi.org/10.1145/3359591.3359737">DOI</a>&nbsp;| 
+<a href="https://martin.kleppmann.com/papers/local-first.pdf">.pdf</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: systems, usability
+</font></blockquote>
 
 </dd>
 
 
 <dt>
-[<a name="Almeida2013counters">65</a>]
+[<a name="Almeida2013counters">66</a>]
 </dt>
 <dd>
 Paulo&nbsp;S&eacute;rgio Almeida and Carlos Baquero.
@@ -997,12 +1283,15 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#Almeida2013counters">bib</a>&nbsp;| 
 <a href="http://arxiv.org/abs/1307.3207">arXiv</a>&nbsp;| 
 <a href="https://arxiv.org/abs/1307.3207">http</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: counters
+</font></blockquote>
 
 </dd>
 
 
 <dt>
-[<a name="Enes2017sync">66</a>]
+[<a name="Enes2017sync">67</a>]
 </dt>
 <dd>
 Vitor Enes.
@@ -1010,12 +1299,15 @@ <h1>CRDT Papers</h1>
  Master's thesis, Universidade do Minho, November 2017.
 [&nbsp;<a href="papers_bib.html#Enes2017sync">bib</a>&nbsp;| 
 <a href="https://vitorenes.org/page/other/msc-thesis.pdf">.pdf</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: state-based
+</font></blockquote>
 
 </dd>
 
 
 <dt>
-[<a name="Balegas2015invariants">67</a>]
+[<a name="Balegas2015invariants">68</a>]
 </dt>
 <dd>
 Valter Balegas, Diogo Serra, S&eacute;rgio Duarte, Carla Ferreira, Marc Shapiro,
@@ -1027,12 +1319,15 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#Balegas2015invariants">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1109/SRDS.2015.32">DOI</a>&nbsp;| 
 <a href="http://arxiv.org/abs/1503.09052">arXiv</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: counters
+</font></blockquote>
 
 </dd>
 
 
 <dt>
-[<a name="Navalho2013stream">68</a>]
+[<a name="Navalho2013stream">69</a>]
 </dt>
 <dd>
 David Navalho, S&eacute;rgio Duarte, Nuno Pregui&ccedil;a, and Marc Shapiro.
@@ -1043,12 +1338,15 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#Navalho2013stream">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1145/2460756.2460762">DOI</a>&nbsp;| 
 <a href="https://pages.lip6.fr/Marc.Shapiro/papers/computational-CRDTs-CloudDP-2013.pdf">.pdf</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: computation
+</font></blockquote>
 
 </dd>
 
 
 <dt>
-[<a name="Bieniusa2012sets">69</a>]
+[<a name="Bieniusa2012sets">70</a>]
 </dt>
 <dd>
 Annette Bieniusa, Marek Zawirski, Nuno Pregui&ccedil;a, Marc Shapiro, Carlos
@@ -1060,12 +1358,15 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#Bieniusa2012sets">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1007/978-3-642-33651-5_48">DOI</a>&nbsp;| 
 <a href="https://pages.lip6.fr/Marc.Shapiro/papers/semantics-sets-BA-DISC-2012.pdf">.pdf</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: set-crdt, specification
+</font></blockquote>
 
 </dd>
 
 
 <dt>
-[<a name="Bieniusa2012optimized">70</a>]
+[<a name="Bieniusa2012optimized">71</a>]
 </dt>
 <dd>
 Annette Bieniusa, Marek Zawirski, Nuno Pregui&ccedil;a, Marc Shapiro, Carlos
@@ -1075,12 +1376,15 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#Bieniusa2012optimized">bib</a>&nbsp;| 
 <a href="http://arxiv.org/abs/1210.3368">arXiv</a>&nbsp;| 
 <a href="http://hal.inria.fr/hal-00738680/PDF/RR-8083.pdf">.pdf</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: set-crdt
+</font></blockquote>
 
 </dd>
 
 
 <dt>
-[<a name="Nicolaescu2015Yjs">71</a>]
+[<a name="Nicolaescu2015Yjs">72</a>]
 </dt>
 <dd>
 Petru Nicolaescu, Kevin Jahns, Michael Derntl, and Ralf Klamma.
@@ -1091,12 +1395,15 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#Nicolaescu2015Yjs">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1007/978-3-319-19890-3_55">DOI</a>&nbsp;| 
 <a href="http://dbis.rwth-aachen.de/~derntl/papers/preprints/icwe2015-preprint.pdf">.pdf</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: systems, Yjs
+</font></blockquote>
 
 </dd>
 
 
 <dt>
-[<a name="Lv2018CAD">72</a>]
+[<a name="Lv2018CAD">73</a>]
 </dt>
 <dd>
 Xiao Lv, Fazhi He, Yuan Cheng, and Yiqi Wu.
@@ -1105,12 +1412,15 @@ <h1>CRDT Papers</h1>
  <em>Advanced Engineering Informatics</em>, 38:381--391, August 2018.
 [&nbsp;<a href="papers_bib.html#Lv2018CAD">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1016/j.aei.2018.08.008">DOI</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: systems
+</font></blockquote>
 
 </dd>
 
 
 <dt>
-[<a name="Zeller2014verification">73</a>]
+[<a name="Zeller2014verification">74</a>]
 </dt>
 <dd>
 Peter Zeller, Annette Bieniusa, and Arnd Poetzsch-Heffter.
@@ -1121,12 +1431,15 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#Zeller2014verification">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1007/978-3-662-43613-4_3">DOI</a>&nbsp;| 
 <a href="https://softech.cs.uni-kl.de/homepage/publications/Zeller.Bieniusa.Poetzsch-Heffter.Forte2014.pdf">.pdf</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: specification, verification
+</font></blockquote>
 
 </dd>
 
 
 <dt>
-[<a name="Gomes2017verifying">74</a>]
+[<a name="Gomes2017verifying">75</a>]
 </dt>
 <dd>
 Victor B&nbsp;F Gomes, Martin Kleppmann, Dominic&nbsp;P Mulligan, and Alastair&nbsp;R
@@ -1137,12 +1450,15 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#Gomes2017verifying">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1145/3133933">DOI</a>&nbsp;| 
 <a href="http://arxiv.org/abs/1707.01747">arXiv</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: specification, verification
+</font></blockquote>
 
 </dd>
 
 
 <dt>
-[<a name="Burckhardt2014specification">75</a>]
+[<a name="Burckhardt2014specification">76</a>]
 </dt>
 <dd>
 Sebastian Burckhardt, Alexey Gotsman, Hongseok Yang, and Marek Zawirski.
@@ -1152,12 +1468,15 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#Burckhardt2014specification">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1145/2535838.2535848">DOI</a>&nbsp;| 
 <a href="http://software.imdea.org/~gotsman/papers/distrmm-popl14-ext.pdf">.pdf</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: specification, verification
+</font></blockquote>
 
 </dd>
 
 
 <dt>
-[<a name="Kleppmann2018OpSets">76</a>]
+[<a name="Kleppmann2018OpSets">77</a>]
 </dt>
 <dd>
 Martin Kleppmann, Victor B&nbsp;F Gomes, Dominic&nbsp;P Mulligan, and Alastair&nbsp;R
@@ -1168,12 +1487,15 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#Kleppmann2018OpSets">bib</a>&nbsp;| 
 <a href="http://arxiv.org/abs/1805.04263">arXiv</a>&nbsp;| 
 <a href="https://arxiv.org/abs/1805.04263">http</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: specification, verification
+</font></blockquote>
 
 </dd>
 
 
 <dt>
-[<a name="Gotsman2016CISE">77</a>]
+[<a name="Gotsman2016CISE">78</a>]
 </dt>
 <dd>
 Alexey Gotsman, Hongseok Yang, Carla Ferreira, Mahsa Najafzadeh, and Marc
@@ -1185,12 +1507,15 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#Gotsman2016CISE">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1145/2837614.2837625">DOI</a>&nbsp;| 
 <a href="http://software.imdea.org/~gotsman/papers/logic-popl16.pdf">.pdf</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: specification, verification
+</font></blockquote>
 
 </dd>
 
 
 <dt>
-[<a name="Attiya2016text">78</a>]
+[<a name="Attiya2016text">79</a>]
 </dt>
 <dd>
 Hagit Attiya, Sebastian Burckhardt, Alexey Gotsman, Adam Morrison, Hongseok
@@ -1201,12 +1526,15 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#Attiya2016text">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1145/2933057.2933090">DOI</a>&nbsp;| 
 <a href="http://www.cs.ox.ac.uk/people/hongseok.yang/paper/podc16-full.pdf">.pdf</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: text-editing, specification, verification
+</font></blockquote>
 
 </dd>
 
 
 <dt>
-[<a name="Li2014Sieve">79</a>]
+[<a name="Li2014Sieve">80</a>]
 </dt>
 <dd>
 Cheng Li, Jo&atilde;o Leit&atilde;o, Allen Clement, Nuno Pregui&ccedil;a, Rodrigo
@@ -1216,12 +1544,52 @@ <h1>CRDT Papers</h1>
   281--292. USENIX, June 2014.
 [&nbsp;<a href="papers_bib.html#Li2014Sieve">bib</a>&nbsp;| 
 <a href="https://www.usenix.org/conference/atc14/technical-sessions/presentation/li_cheng_2">http</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: verification
+</font></blockquote>
+
+</dd>
+
+
+<dt>
+[<a name="Kollmann2019Snapdoc">81</a>]
+</dt>
+<dd>
+Stephan&nbsp;A Kollmann, Martin Kleppmann, and Alastair&nbsp;R Beresford.
+ Snapdoc: Authenticated snapshots with history privacy in
+  peer-to-peer collaborative editing.
+ <em>Proceedings on Privacy Enhancing Technologies (PoPETS)</em>,
+  2019(3):210--232, July 2019.
+[&nbsp;<a href="papers_bib.html#Kollmann2019Snapdoc">bib</a>&nbsp;| 
+<a href="http://dx.doi.org/10.2478/popets-2019-0044">DOI</a>&nbsp;| 
+<a href="https://www.petsymposium.org/2019/files/papers/issue3/popets-2019-0044.pdf">.pdf</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: security
+</font></blockquote>
+
+</dd>
+
+
+<dt>
+[<a name="Truong2012authenticating">82</a>]
+</dt>
+<dd>
+Hien Thi&nbsp;Thu Truong, Claudia-Lavinia Ignat, and Pascal Molli.
+ Authenticating operation-based history in collaborative systems.
+ In <em>17th ACM International Conference on Supporting Group Work</em>,
+  GROUP 2012, pages 131--140. ACM, October 2012.
+[&nbsp;<a href="papers_bib.html#Truong2012authenticating">bib</a>&nbsp;| 
+<a href="http://dx.doi.org/10.1145/2389176.2389197">DOI</a>&nbsp;| 
+<a href="https://hal.inria.fr/hal-00761045/document">http</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: security
+</font></blockquote>
 
 </dd>
 
 
 <dt>
-[<a name="Conway2012lattices">80</a>]
+[<a name="Conway2012lattices">83</a>]
 </dt>
 <dd>
 Neil Conway, William&nbsp;R. Marczak, Peter Alvaro, Joseph&nbsp;M. Hellerstein, and David
@@ -1232,12 +1600,15 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#Conway2012lattices">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1145/2391229.2391230">DOI</a>&nbsp;| 
 <a href="https://www2.eecs.berkeley.edu/Pubs/TechRpts/2012/EECS-2012-167.pdf">.pdf</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: crdt-related
+</font></blockquote>
 
 </dd>
 
 
 <dt>
-[<a name="Burckhardt2012CloudTypes">81</a>]
+[<a name="Burckhardt2012CloudTypes">84</a>]
 </dt>
 <dd>
 Sebastian Burckhardt, Manuel F&auml;hndrich, Daan Leijen, and Benjamin&nbsp;P Wood.
@@ -1247,12 +1618,15 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#Burckhardt2012CloudTypes">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1007/978-3-642-31057-7_14">DOI</a>&nbsp;| 
 <a href="https://www.microsoft.com/en-us/research/wp-content/uploads/2016/02/final-with-color.pdf">.pdf</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: crdt-related
+</font></blockquote>
 
 </dd>
 
 
 <dt>
-[<a name="Burckhardt2012transactions">82</a>]
+[<a name="Burckhardt2012transactions">85</a>]
 </dt>
 <dd>
 Sebastian Burckhardt, Daan Leijen, Manuel F&auml;hndrich, and Mooly Sagiv.
@@ -1262,12 +1636,15 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#Burckhardt2012transactions">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1007/978-3-642-28869-2_4">DOI</a>&nbsp;| 
 <a href="https://www.microsoft.com/en-us/research/wp-content/uploads/2016/02/ecr-esop2012.pdf">.pdf</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: crdt-related, transactions
+</font></blockquote>
 
 </dd>
 
 
 <dt>
-[<a name="Kaki2019mergeable">83</a>]
+[<a name="Kaki2019mergeable">86</a>]
 </dt>
 <dd>
 Gowtham Kaki, Swarn Priya, KC&nbsp;Sivaramakrishnan, and Suresh Jagannathan.
@@ -1277,12 +1654,15 @@ <h1>CRDT Papers</h1>
 [&nbsp;<a href="papers_bib.html#Kaki2019mergeable">bib</a>&nbsp;| 
 <a href="http://dx.doi.org/10.1145/3360580">DOI</a>&nbsp;| 
 <a href="https://gowthamk.github.io/docs/mrdt.pdf">.pdf</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: crdt-related
+</font></blockquote>
 
 </dd>
 
 
 <dt>
-[<a name="Kuper2014LVars">84</a>]
+[<a name="Kuper2014LVars">87</a>]
 </dt>
 <dd>
 Lindsey Kuper and Ryan&nbsp;R Newton.
@@ -1292,7 +1672,10 @@ <h1>CRDT Papers</h1>
   Programming</em>, WoDet 2014, March 2014.
 [&nbsp;<a href="papers_bib.html#Kuper2014LVars">bib</a>&nbsp;| 
 <a href="http://wodet.cs.washington.edu/wp-content/uploads/2014/02/wodet2014-final1.pdf">.pdf</a>&nbsp;]
+<blockquote><font size="-1">
+Keywords: crdt-related, shared-memory concurrency
+</font></blockquote>
 
 </dd>
-</dl><hr><p><em>This file was generated by
-<a href="http://www.lri.fr/~filliatr/bibtex2html/">bibtex2html</a> 1.99.</em></p>
+</dl>
+
diff --git a/papers_bib.html b/papers_bib.html
index ebe3561..9fb0b20 100644
--- a/papers_bib.html
+++ b/papers_bib.html
@@ -10,7 +10,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   pages = {386--400},
   doi = {10.1007/978-3-642-24550-3_29},
   pdf = {https://pages.lip6.fr/Marek.Zawirski/papers/RR-7687.pdf},
-  publisher = {Springer LNCS volume 6976}
+  publisher = {Springer LNCS volume 6976},
+  keywords = {introduction}
 }
 </pre>
 
@@ -23,7 +24,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   month = jan,
   institution = {INRIA},
   type = {Research Report},
-  url = {<a href="http://hal.inria.fr/inria-00555588/">http://hal.inria.fr/inria-00555588/</a>}
+  url = {<a href="http://hal.inria.fr/inria-00555588/">http://hal.inria.fr/inria-00555588/</a>},
+  keywords = {introduction}
 }
 </pre>
 
@@ -39,7 +41,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   month = apr,
   publisher = {ACM},
   doi = {10.1145/1773912.1773921},
-  pdf = {<a href="http://asc.di.fct.unl.pt/~nmp/pubs/osr-2010.pdf">http://asc.di.fct.unl.pt/~nmp/pubs/osr-2010.pdf</a>}
+  pdf = {<a href="http://asc.di.fct.unl.pt/~nmp/pubs/osr-2010.pdf">http://asc.di.fct.unl.pt/~nmp/pubs/osr-2010.pdf</a>},
+  keywords = {introduction}
 }
 </pre>
 
@@ -55,7 +58,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   month = oct,
   publisher = {now publishers},
   doi = {10.1561/2500000011},
-  pdf = {https://www.nowpublishers.com/article/Download/PGL-011}
+  pdf = {https://www.nowpublishers.com/article/Download/PGL-011},
+  keywords = {introduction}
 }
 </pre>
 
@@ -68,7 +72,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   month = may,
   publisher = {Springer},
   doi = {10.1007/978-3-319-63962-8_185-1},
-  eprint = {1805.06358}
+  eprint = {1805.06358},
+  keywords = {introduction}
 }
 </pre>
 
@@ -79,7 +84,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   year = {2018},
   month = jun,
   eprint = {1806.10254},
-  url = {https://arxiv.org/abs/1806.10254}
+  url = {https://arxiv.org/abs/1806.10254},
+  keywords = {introduction}
 }
 </pre>
 
@@ -95,6 +101,7 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   publisher = {Springer LNCS volume 8460},
   doi = {10.1007/978-3-662-43352-2_11},
   pdf = {<a href="http://gsd.di.uminho.pt/members/cbm/ps/crdtOpsMiddleware.pdf">http://gsd.di.uminho.pt/members/cbm/ps/crdtOpsMiddleware.pdf</a>},
+  keywords = {operation-based},
   note = {A shorter paper with the same title appears in PaPEC 2014}
 }
 </pre>
@@ -106,7 +113,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   year = {2017},
   eprint = {1710.04469},
   month = oct,
-  url = {https://arxiv.org/abs/1710.04469}
+  url = {https://arxiv.org/abs/1710.04469},
+  keywords = {operation-based}
 }
 </pre>
 
@@ -117,7 +125,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   year = {2015},
   month = may,
   institution = {HASLab, INESC TEC},
-  url = {<a href="http://haslab.uminho.pt/cbm/files/crdtcompositionreport.pdf">http://haslab.uminho.pt/cbm/files/crdtcompositionreport.pdf</a>}
+  url = {<a href="http://haslab.uminho.pt/cbm/files/crdtcompositionreport.pdf">http://haslab.uminho.pt/cbm/files/crdtcompositionreport.pdf</a>},
+  keywords = {state-based}
 }
 </pre>
 
@@ -132,7 +141,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   month = may,
   publisher = {Springer LNCS volume 9466},
   doi = {10.1007/978-3-319-26850-7_5},
-  eprint = {1410.2803}
+  eprint = {1410.2803},
+  keywords = {state-based}
 }
 </pre>
 
@@ -146,7 +156,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   articleno = {12},
   publisher = {ACM},
   doi = {10.1145/2911151.2911163},
-  pdf = {https://novasys.di.fct.unl.pt/~alinde/publications/a12-van_der_linde.pdf}
+  pdf = {https://novasys.di.fct.unl.pt/~alinde/publications/a12-van_der_linde.pdf},
+  keywords = {state-based}
 }
 </pre>
 
@@ -159,22 +170,24 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   pages = {162--173},
   year = {2018},
   eprint = {1603.01529},
-  doi = {10.1016/j.jpdc.2017.08.003}
+  doi = {10.1016/j.jpdc.2017.08.003},
+  keywords = {state-based}
 }
 </pre>
 
-<a name="Yu2020undo"></a><pre>
-@inproceedings{<a href="papers.html#Yu2020undo">Yu2020undo</a>,
+<a name="Yu2019undo"></a><pre>
+@inproceedings{<a href="papers.html#Yu2019undo">Yu2019undo</a>,
   author = {Yu, Weihai and Elvinger, Victorien and Ignat, Claudia-Lavinia},
   title = {A Generic Undo Support for State-Based {CRDTs}},
-  booktitle = {23rd International Conference on Principles of Distributed Systems ()},
+  booktitle = {23rd International Conference on Principles of Distributed Systems},
   series = {OPODIS 2019},
   year = {2019},
   month = nov,
   publisher = {Dagstuhl LIPIcs},
   articleno = {14},
   doi = {10.4230/LIPIcs.OPODIS.2019.14},
-  pdf = {https://drops.dagstuhl.de/opus/volltexte/2020/11800/pdf/LIPIcs-OPODIS-2019-14.pdf}
+  pdf = {https://drops.dagstuhl.de/opus/volltexte/2020/11800/pdf/LIPIcs-OPODIS-2019-14.pdf},
+  keywords = {state-based, undo}
 }
 </pre>
 
@@ -188,7 +201,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   month = apr,
   pages = {148--159},
   doi = {10.1109/ICDE.2019.00022},
-  eprint = {1803.02750}
+  eprint = {1803.02750},
+  keywords = {state-based}
 }
 </pre>
 
@@ -203,14 +217,15 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   publisher = {ACM},
   month = nov,
   doi = {10.1145/1180875.1180916},
-  pdf = {https://hal.inria.fr/file/index/docid/108523/filename/OsterCSCW06.pdf}
+  pdf = {https://hal.inria.fr/file/index/docid/108523/filename/OsterCSCW06.pdf},
+  keywords = {text-editing, WOOT}
 }
 </pre>
 
 <a name="Weiss2007Wooki"></a><pre>
 @inproceedings{<a href="papers.html#Weiss2007Wooki">Weiss2007Wooki</a>,
   author = {Weiss, St{\'e}phane and Urso, Pascal and Molli, Pascal},
-  title = {Wooki: A {P2P} Wiki-Based Collaborative Writing Tool},
+  title = {{Wooki}: A {P2P} Wiki-Based Collaborative Writing Tool},
   booktitle = {8th International Conference on Web Information Systems Engineering},
   series = {WISE 2007},
   year = {2007},
@@ -218,7 +233,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   publisher = {Springer LNCS volume 4831},
   month = dec,
   doi = {10.1007/978-3-540-76993-4_42},
-  pdf = {<a href="http://pagesperso.lina.univ-nantes.fr/~molli-p/pmwiki/uploads/Main/weiss07.pdf">http://pagesperso.lina.univ-nantes.fr/~molli-p/pmwiki/uploads/Main/weiss07.pdf</a>}
+  pdf = {<a href="http://pagesperso.lina.univ-nantes.fr/~molli-p/pmwiki/uploads/Main/weiss07.pdf">http://pagesperso.lina.univ-nantes.fr/~molli-p/pmwiki/uploads/Main/weiss07.pdf</a>},
+  keywords = {text-editing, WOOT}
 }
 </pre>
 
@@ -231,7 +247,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   month = may,
   institution = {INRIA},
   type = {Research Report},
-  url = {https://hal.inria.fr/inria-00071240/document}
+  url = {https://hal.inria.fr/inria-00071240/document},
+  keywords = {text-editing, WOOT}
 }
 </pre>
 
@@ -245,7 +262,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   pages = {395--403},
   publisher = {IEEE},
   doi = {10.1109/ICDCS.2009.20},
-  pdf = {<a href="http://dx.doi.org/10.1109/ICDCS.2009.20">http://dx.doi.org/10.1109/ICDCS.2009.20</a>}
+  pdf = {<a href="http://dx.doi.org/10.1109/ICDCS.2009.20">http://dx.doi.org/10.1109/ICDCS.2009.20</a>},
+  keywords = {text-editing, Treedoc}
 }
 </pre>
 
@@ -259,7 +277,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   pages = {404--412},
   publisher = {IEEE},
   doi = {10.1109/ICDCS.2009.75},
-  pdf = {https://hal.inria.fr/inria-00432368/document}
+  pdf = {https://hal.inria.fr/inria-00432368/document},
+  keywords = {text-editing, Logoot}
 }
 </pre>
 
@@ -276,7 +295,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   pages = {1162--1174},
   publisher = {IEEE},
   doi = {10.1109/TPDS.2009.173},
-  pdf = {https://www.researchgate.net/profile/Pascal_Urso/publication/233882440_Logoot-Undo_Distributed_Collaborative_Editing_System/links/0fcfd50c84f5194937000000.pdf}
+  pdf = {https://www.researchgate.net/profile/Pascal_Urso/publication/233882440_Logoot-Undo_Distributed_Collaborative_Editing_System/links/0fcfd50c84f5194937000000.pdf},
+  keywords = {text-editing, Logoot, undo}
 }
 </pre>
 
@@ -293,7 +313,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   pages = {354--368},
   publisher = {Elsevier},
   doi = {10.1016/j.jpdc.2010.12.006},
-  pdf = {<a href="http://csl.snu.ac.kr/papers/jpdc11.pdf">http://csl.snu.ac.kr/papers/jpdc11.pdf</a>}
+  pdf = {<a href="http://csl.snu.ac.kr/papers/jpdc11.pdf">http://csl.snu.ac.kr/papers/jpdc11.pdf</a>},
+  keywords = {text-editing, RGA}
 }
 </pre>
 
@@ -308,7 +329,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   publisher = {ACM},
   month = sep,
   doi = {10.1145/2494266.2494278},
-  pdf = {https://hal.archives-ouvertes.fr/file/index/docid/921633/filename/fp025-nedelec.pdf}
+  pdf = {https://hal.archives-ouvertes.fr/file/index/docid/921633/filename/fp025-nedelec.pdf},
+  keywords = {text-editing, LSEQ}
 }
 </pre>
 
@@ -323,7 +345,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   publisher = {ACM},
   month = apr,
   doi = {10.1145/2872518.2890539},
-  pdf = {https://hal.archives-ouvertes.fr/hal-01303333}
+  pdf = {https://hal.archives-ouvertes.fr/hal-01303333},
+  keywords = {text-editing, LSEQ}
 }
 </pre>
 
@@ -338,7 +361,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   publisher = {ACM},
   month = sep,
   doi = {10.1145/2034691.2034717},
-  pdf = {https://hal.inria.fr/docs/00/62/95/03/PDF/doce63-ahmednacer.pdf}
+  pdf = {https://hal.inria.fr/docs/00/62/95/03/PDF/doce63-ahmednacer.pdf},
+  keywords = {text-editing}
 }
 </pre>
 
@@ -353,7 +377,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   publisher = {ACM},
   month = nov,
   doi = {10.1145/2957276.2957300},
-  pdf = {https://hal.inria.fr/hal-01343941/document}
+  pdf = {https://hal.inria.fr/hal-01343941/document},
+  keywords = {text-editing, RGASplit}
 }
 </pre>
 
@@ -368,7 +393,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   publisher = {Springer LNCS volume 9038},
   month = jun,
   doi = {10.1007/978-3-319-19129-4_16},
-  pdf = {https://members.loria.fr/CIgnat/files/pdf/YuDAIS15.pdf}
+  pdf = {https://members.loria.fr/CIgnat/files/pdf/YuDAIS15.pdf},
+  keywords = {text-editing, undo}
 }
 </pre>
 
@@ -382,7 +408,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   pages = {45--50},
   publisher = {IEEE},
   month = sep,
-  doi = {10.1109/CSCWD.2016.7565961}
+  doi = {10.1109/CSCWD.2016.7565961},
+  keywords = {text-editing}
 }
 </pre>
 
@@ -396,7 +423,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   publisher = {ICST},
   month = oct,
   doi = {10.4108/icst.collaboratecom.2013.254113},
-  pdf = {<a href="http://asc.di.fct.unl.pt/~nmp/pubs/collaboratecom-2013.pdf">http://asc.di.fct.unl.pt/~nmp/pubs/collaboratecom-2013.pdf</a>}
+  pdf = {<a href="http://asc.di.fct.unl.pt/~nmp/pubs/collaboratecom-2013.pdf">http://asc.di.fct.unl.pt/~nmp/pubs/collaboratecom-2013.pdf</a>},
+  keywords = {text-editing}
 }
 </pre>
 
@@ -411,7 +439,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   publisher = {ACM},
   month = nov,
   doi = {10.1145/2957276.2957310},
-  pdf = {https://www.researchgate.net/publication/310212186_Near_Real-Time_Peer-to-Peer_Shared_Editing_on_Extensible_Data_Types}
+  pdf = {https://www.researchgate.net/publication/310212186_Near_Real-Time_Peer-to-Peer_Shared_Editing_on_Extensible_Data_Types},
+  keywords = {text-editing, Yjs}
 }
 </pre>
 
@@ -425,7 +454,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   publisher = {Springer LNCS volume 6426},
   month = oct,
   doi = {10.1007/978-3-642-16934-2_37},
-  eprint = {1010.3615}
+  eprint = {1010.3615},
+  keywords = {trees, undo}
 }
 </pre>
 
@@ -440,7 +470,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   publisher = {INRIA},
   type = {Research Report},
   eprint = {1207.5990},
-  url = {https://hal.inria.fr/hal-00720681/}
+  url = {https://hal.inria.fr/hal-00720681/},
+  keywords = {trees}
 }
 </pre>
 
@@ -455,7 +486,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   pages = {2733--2746},
   month = apr,
   doi = {10.1109/TPDS.2017.2697382},
-  eprint = {1608.03960}
+  eprint = {1608.03960},
+  keywords = {trees}
 }
 </pre>
 
@@ -470,7 +502,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   month = may,
   articleno = {10},
   doi = {10.1145/2757667.2757683},
-  pdf = {https://pages.lip6.fr/Marc.Shapiro/papers/geodistr-FS-Systor-2015.pdf}
+  pdf = {https://pages.lip6.fr/Marc.Shapiro/papers/geodistr-FS-Systor-2015.pdf},
+  keywords = {trees}
 }
 </pre>
 
@@ -485,7 +518,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   publisher = {Springer LNCS volume 10747},
   month = jan,
   doi = {10.1007/978-3-319-73721-8_17},
-  pdf = {https://pages.lip6.fr/Marc.Shapiro/papers/VMCAI-2018-filesys.pdf}
+  pdf = {https://pages.lip6.fr/Marc.Shapiro/papers/VMCAI-2018-filesys.pdf},
+  keywords = {trees}
 }
 </pre>
 
@@ -499,7 +533,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   articleno = {1},
   publisher = {ACM},
   doi = {10.1145/2596631.2596633},
-  pdf = {https://pages.lip6.fr/syncfree/attachments/article/46/WP3-report.pdf#page=31}
+  pdf = {https://pages.lip6.fr/syncfree/attachments/article/46/WP3-report.pdf#page=31},
+  keywords = {systems, composition}
 }
 </pre>
 
@@ -512,7 +547,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   publisher = {ACM},
   articleno = {3},
   doi = {10.1145/2596631.2596634},
-  pdf = {https://core.ac.uk/download/pdf/154274611.pdf}
+  pdf = {https://core.ac.uk/download/pdf/154274611.pdf},
+  keywords = {composition}
 }
 </pre>
 
@@ -527,7 +563,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   articleno = {9},
   publisher = {ACM},
   doi = {10.1145/2596631.2596636},
-  pdf = {https://hal.inria.fr/file/index/docid/957167/filename/main.pdf}
+  pdf = {https://hal.inria.fr/file/index/docid/957167/filename/main.pdf},
+  keywords = {text-editing}
 }
 </pre>
 
@@ -541,7 +578,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   articleno = {13},
   publisher = {ACM},
   doi = {10.1145/2596631.2596635},
-  pdf = {https://pages.lip6.fr/syncfree/attachments/article/46/WP3-report.pdf#page=34}
+  pdf = {https://pages.lip6.fr/syncfree/attachments/article/46/WP3-report.pdf#page=34},
+  keywords = {composition}
 }
 </pre>
 
@@ -556,7 +594,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   articleno = {8},
   publisher = {ACM},
   doi = {10.1145/2596631.2596641},
-  url = {<a href="http://www.ds.ewi.tudelft.nl/~victor/polo.pdf">http://www.ds.ewi.tudelft.nl/~victor/polo.pdf</a>}
+  url = {<a href="http://www.ds.ewi.tudelft.nl/~victor/polo.pdf">http://www.ds.ewi.tudelft.nl/~victor/polo.pdf</a>},
+  keywords = {text-editing, operation-based}
 }
 </pre>
 
@@ -571,7 +610,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   articleno = {1},
   publisher = {ACM},
   doi = {10.1145/2745947.2745948},
-  pdf = {<a href="http://asc.di.fct.unl.pt/~nmp/pubs/papoc-2015-1.pdf">http://asc.di.fct.unl.pt/~nmp/pubs/papoc-2015-1.pdf</a>}
+  pdf = {<a href="http://asc.di.fct.unl.pt/~nmp/pubs/papoc-2015-1.pdf">http://asc.di.fct.unl.pt/~nmp/pubs/papoc-2015-1.pdf</a>},
+  keywords = {computation}
 }
 </pre>
 
@@ -586,7 +626,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   articleno = {4},
   publisher = {ACM},
   doi = {10.1145/2745947.2745951},
-  pdf = {<a href="http://irenezhang.net/papers/claret-papoc15.pdf">http://irenezhang.net/papers/claret-papoc15.pdf</a>}
+  pdf = {<a href="http://irenezhang.net/papers/claret-papoc15.pdf">http://irenezhang.net/papers/claret-papoc15.pdf</a>},
+  keywords = {transactions, systems}
 }
 </pre>
 
@@ -600,7 +641,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   month = apr,
   articleno = {5},
   publisher = {ACM},
-  doi = {10.1145/2745947.2745952}
+  doi = {10.1145/2745947.2745952},
+  keywords = {systems}
 }
 </pre>
 
@@ -615,7 +657,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   articleno = {7},
   publisher = {ACM},
   doi = {10.1145/2745947.2745954},
-  url = {https://www.info.ucl.ac.be/~pvr/papoc-2015-lasp-abstract.pdf}
+  url = {https://www.info.ucl.ac.be/~pvr/papoc-2015-lasp-abstract.pdf},
+  keywords = {computation}
 }
 </pre>
 
@@ -630,7 +673,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   articleno = {5},
   publisher = {ACM},
   doi = {10.1145/2911151.2911156},
-  eprint = {1605.06424}
+  eprint = {1605.06424},
+  keywords = {systems, composition}
 }
 </pre>
 
@@ -646,7 +690,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   publisher = {ACM},
   doi = {10.1145/2911151.2911157},
   url = {https://core.ac.uk/download/pdf/154274593.pdf},
-  eprint = {1511.05010}
+  eprint = {1511.05010},
+  keywords = {state-based}
 }
 </pre>
 
@@ -661,7 +706,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   articleno = {10},
   publisher = {ACM},
   doi = {10.1145/2911151.2911159},
-  url = {<a href="http://haslab.uminho.pt/cbm/files/abstractcounterpapocfinal.pdf">http://haslab.uminho.pt/cbm/files/abstractcounterpapocfinal.pdf</a>}
+  url = {<a href="http://haslab.uminho.pt/cbm/files/abstractcounterpapocfinal.pdf">http://haslab.uminho.pt/cbm/files/abstractcounterpapocfinal.pdf</a>},
+  keywords = {composition, counters}
 }
 </pre>
 
@@ -675,7 +721,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   month = apr,
   articleno = {11},
   publisher = {ACM},
-  doi = {10.1145/2911151.2911154}
+  doi = {10.1145/2911151.2911154},
+  keywords = {systems, Replikativ}
 }
 </pre>
 
@@ -690,7 +737,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   articleno = {13},
   publisher = {ACM},
   doi = {10.1145/2911151.2911158},
-  pdf = {https://softech.cs.uni-kl.de/homepage/publications/Akkoorath.Bieniusa2016.pdf}
+  pdf = {https://softech.cs.uni-kl.de/homepage/publications/Akkoorath.Bieniusa2016.pdf},
+  keywords = {shared-memory concurrency}
 }
 </pre>
 
@@ -705,7 +753,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   publisher = {ACM},
   articleno = {2},
   doi = {10.1145/3064889.3064892},
-  pdf = {https://haslab.uminho.pt/cbm/files/a3-younes.pdf}
+  pdf = {https://haslab.uminho.pt/cbm/files/a3-younes.pdf},
+  keywords = {counters}
 }
 </pre>
 
@@ -720,7 +769,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   publisher = {ACM},
   articleno = {3},
   doi = {10.1145/3064889.3064893},
-  pdf = {https://dl.acm.org/authorize?N37605}
+  pdf = {https://dl.acm.org/authorize?N37605},
+  keywords = {testing, verification}
 }
 </pre>
 
@@ -734,7 +784,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   month = apr,
   publisher = {ACM},
   doi = {10.1145/3064889.3064894},
-  pdf = {https://haslab.uminho.pt/sites/default/files/cbm/files/a5-enes.pdf}
+  pdf = {https://haslab.uminho.pt/sites/default/files/cbm/files/a5-enes.pdf},
+  keywords = {counters}
 }
 </pre>
 
@@ -749,7 +800,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   publisher = {ACM},
   articleno = {1},
   doi = {10.1145/3194261.3194262},
-  pdf = {https://pages.lip6.fr/Marc.Shapiro/papers/causal-refs-papoc-2018-04.pdf}
+  pdf = {https://pages.lip6.fr/Marc.Shapiro/papers/causal-refs-papoc-2018-04.pdf},
+  keywords = {causal-consistency}
 }
 </pre>
 
@@ -764,7 +816,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   publisher = {ACM},
   articleno = {2},
   doi = {10.1145/3194261.3194263},
-  pdf = {<a href="http://myter.be/papers/papoc18.pdf">http://myter.be/papers/papoc18.pdf</a>}
+  pdf = {<a href="http://myter.be/papers/papoc18.pdf">http://myter.be/papers/papoc18.pdf</a>},
+  keywords = {counters}
 }
 </pre>
 
@@ -779,7 +832,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   publisher = {ACM},
   articleno = {5},
   doi = {10.1145/3301419.3323971},
-  pdf = {https://repositorio.inesctec.pt/bitstream/123456789/10536/1/P-00Q-WJM.pdf}
+  pdf = {https://repositorio.inesctec.pt/bitstream/123456789/10536/1/P-00Q-WJM.pdf},
+  keywords = {composition}
 }
 </pre>
 
@@ -794,7 +848,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   publisher = {ACM},
   articleno = {6},
   doi = {10.1145/3301419.3323972},
-  pdf = {https://martin.kleppmann.com/papers/interleaving-papoc19.pdf}
+  pdf = {https://martin.kleppmann.com/papers/interleaving-papoc19.pdf},
+  keywords = {text-editing}
 }
 </pre>
 
@@ -808,12 +863,13 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   month = mar,
   publisher = {ACM},
   articleno = {7},
-  doi = {10.1145/3301419.3323973}
+  doi = {10.1145/3301419.3323973},
+  keywords = {systems}
 }
 </pre>
 
-<a name="10.1145/3301419.3323974"></a><pre>
-@inproceedings{<a href="papers.html#10.1145/3301419.3323974">10.1145/3301419.3323974</a>,
+<a name="DePorre2019generic"></a><pre>
+@inproceedings{<a href="papers.html#DePorre2019generic">DePorre2019generic</a>,
   author = {De Porre, Kevin and Myter, Florian and De Troyer, Christophe and Scholliers, Christophe and De Meuter, Wolfgang and Boix, Elisa Gonzalez},
   title = {A Generic Replicated Data Type for Strong Eventual Consistency},
   booktitle = {6th Workshop on Principles and Practice of Consistency for Distributed Data},
@@ -823,7 +879,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   publisher = {ACM},
   articleno = {8},
   doi = {10.1145/3301419.3323974},
-  pdf = {<a href="http://soft.vub.ac.be/Publications/2019/vub-soft-tr-19-08.pdf">http://soft.vub.ac.be/Publications/2019/vub-soft-tr-19-08.pdf</a>}
+  pdf = {<a href="http://soft.vub.ac.be/Publications/2019/vub-soft-tr-19-08.pdf">http://soft.vub.ac.be/Publications/2019/vub-soft-tr-19-08.pdf</a>},
+  keywords = {text-editing, operation-based}
 }
 </pre>
 
@@ -838,7 +895,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   month = oct,
   publisher = {IEEE},
   doi = {10.1109/SRDSW.2014.33},
-  eprint = {1310.3107}
+  eprint = {1310.3107},
+  keywords = {systems, SwiftCloud}
 }
 </pre>
 
@@ -852,7 +910,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   month = nov,
   publisher = {IEEE},
   doi = {10.1109/CloudCom.2015.81},
-  url = {https://dial.uclouvain.be/pr/boreal/object/boreal%3A214300/datastream/PDF_01/view}
+  url = {https://dial.uclouvain.be/pr/boreal/object/boreal%3A214300/datastream/PDF_01/view},
+  keywords = {systems, SwiftCloud}
 }
 </pre>
 
@@ -867,7 +926,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   publisher = {ACM},
   pages = {184--195},
   doi = {10.1145/2790449.2790525},
-  pdf = {https://www.info.ucl.ac.be/~pvr/ppdp-2015-cr.pdf}
+  pdf = {https://www.info.ucl.ac.be/~pvr/ppdp-2015-cr.pdf},
+  keywords = {computation, systems}
 }
 </pre>
 
@@ -882,7 +942,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   publisher = {IEEE},
   pages = {405--414},
   doi = {10.1109/ICDCS.2016.98},
-  pdf = {https://pages.lip6.fr/Marc.Shapiro/papers/Cure-final-ICDCS16.pdf}
+  pdf = {https://pages.lip6.fr/Marc.Shapiro/papers/Cure-final-ICDCS16.pdf},
+  keywords = {systems}
 }
 </pre>
 
@@ -897,7 +958,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   publisher = {ACM},
   articleno = {1},
   doi = {10.1145/3064889.3064891},
-  pdf = {<a href="http://www.redaktion.tu-berlin.de/fileadmin/a34331500/paper/papoc17-jungnickel.pdf">http://www.redaktion.tu-berlin.de/fileadmin/a34331500/paper/papoc17-jungnickel.pdf</a>}
+  pdf = {<a href="http://www.redaktion.tu-berlin.de/fileadmin/a34331500/paper/papoc17-jungnickel.pdf">http://www.redaktion.tu-berlin.de/fileadmin/a34331500/paper/papoc17-jungnickel.pdf</a>},
+  keywords = {systems}
 }
 </pre>
 
@@ -912,7 +974,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   publisher = {ACM},
   pages = {275--290},
   doi = {10.1145/3183713.3196898},
-  pdf = {https://www.microsoft.com/en-us/research/uploads/prod/2018/03/faster-sigmod18.pdf}
+  pdf = {https://www.microsoft.com/en-us/research/uploads/prod/2018/03/faster-sigmod18.pdf},
+  keywords = {systems}
 }
 </pre>
 
@@ -927,7 +990,24 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   publisher = {Springer LNCS volume 10451},
   pages = {39--47},
   doi = {10.1007/978-3-319-66805-5_5},
-  pdf = {https://hal.inria.fr/hal-01652656/document}
+  pdf = {https://hal.inria.fr/hal-01652656/document},
+  keywords = {systems, usability}
+}
+</pre>
+
+<a name="Kleppmann2019localfirst"></a><pre>
+@inproceedings{<a href="papers.html#Kleppmann2019localfirst">Kleppmann2019localfirst</a>,
+  author = {Kleppmann, Martin and Wiggins, Adam and van Hardenberg, Peter and McGranaghan, Mark},
+  title = {Local-First Software: You own your data, in spite of the cloud},
+  booktitle = {ACM SIGPLAN International Symposium on New Ideas, New Paradigms, and Reflections on Programming and Software},
+  series = {Onward! 2019},
+  year = {2019},
+  month = oct,
+  publisher = {ACM},
+  pages = {154--178},
+  doi = {10.1145/3359591.3359737},
+  pdf = {https://martin.kleppmann.com/papers/local-first.pdf},
+  keywords = {systems, usability}
 }
 </pre>
 
@@ -938,7 +1018,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   year = {2013},
   month = jul,
   eprint = {1307.3207},
-  url = {https://arxiv.org/abs/1307.3207}
+  url = {https://arxiv.org/abs/1307.3207},
+  keywords = {counters}
 }
 </pre>
 
@@ -949,7 +1030,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   school = {Universidade do Minho},
   year = {2017},
   month = nov,
-  url = {https://vitorenes.org/page/other/msc-thesis.pdf}
+  url = {https://vitorenes.org/page/other/msc-thesis.pdf},
+  keywords = {state-based}
 }
 </pre>
 
@@ -964,7 +1046,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   publisher = {IEEE},
   pages = {31--36},
   doi = {10.1109/SRDS.2015.32},
-  eprint = {1503.09052}
+  eprint = {1503.09052},
+  keywords = {counters}
 }
 </pre>
 
@@ -980,7 +1063,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   publisher = {ACM},
   pages = {31--36},
   doi = {10.1145/2460756.2460762},
-  pdf = {https://pages.lip6.fr/Marc.Shapiro/papers/computational-CRDTs-CloudDP-2013.pdf}
+  pdf = {https://pages.lip6.fr/Marc.Shapiro/papers/computational-CRDTs-CloudDP-2013.pdf},
+  keywords = {computation}
 }
 </pre>
 
@@ -995,7 +1079,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   publisher = {Springer LNCS volume 7611},
   pages = {441--442},
   doi = {10.1007/978-3-642-33651-5_48},
-  url = {https://pages.lip6.fr/Marc.Shapiro/papers/semantics-sets-BA-DISC-2012.pdf}
+  url = {https://pages.lip6.fr/Marc.Shapiro/papers/semantics-sets-BA-DISC-2012.pdf},
+  keywords = {set-crdt, specification}
 }
 </pre>
 
@@ -1009,7 +1094,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   year = {2012},
   month = oct,
   eprint = {1210.3368},
-  pdf = {<a href="http://hal.inria.fr/hal-00738680/PDF/RR-8083.pdf">http://hal.inria.fr/hal-00738680/PDF/RR-8083.pdf</a>}
+  pdf = {<a href="http://hal.inria.fr/hal-00738680/PDF/RR-8083.pdf">http://hal.inria.fr/hal-00738680/PDF/RR-8083.pdf</a>},
+  keywords = {set-crdt}
 }
 </pre>
 
@@ -1024,7 +1110,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   publisher = {Springer LNCS volume 9114},
   pages = {675--678},
   doi = {10.1007/978-3-319-19890-3_55},
-  url = {<a href="http://dbis.rwth-aachen.de/~derntl/papers/preprints/icwe2015-preprint.pdf">http://dbis.rwth-aachen.de/~derntl/papers/preprints/icwe2015-preprint.pdf</a>}
+  url = {<a href="http://dbis.rwth-aachen.de/~derntl/papers/preprints/icwe2015-preprint.pdf">http://dbis.rwth-aachen.de/~derntl/papers/preprints/icwe2015-preprint.pdf</a>},
+  keywords = {systems, Yjs}
 }
 </pre>
 
@@ -1038,7 +1125,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   volume = {38},
   pages = {381--391},
   publisher = {Elsevier},
-  doi = {10.1016/j.aei.2018.08.008}
+  doi = {10.1016/j.aei.2018.08.008},
+  keywords = {systems}
 }
 </pre>
 
@@ -1053,7 +1141,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   pages = {33--48},
   publisher = {Springer LNCS volume 8461},
   doi = {10.1007/978-3-662-43613-4_3},
-  url = {https://softech.cs.uni-kl.de/homepage/publications/Zeller.Bieniusa.Poetzsch-Heffter.Forte2014.pdf}
+  url = {https://softech.cs.uni-kl.de/homepage/publications/Zeller.Bieniusa.Poetzsch-Heffter.Forte2014.pdf},
+  keywords = {specification, verification}
 }
 </pre>
 
@@ -1068,7 +1157,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   month = oct,
   publisher = {ACM},
   doi = {10.1145/3133933},
-  eprint = {1707.01747}
+  eprint = {1707.01747},
+  keywords = {specification, verification}
 }
 </pre>
 
@@ -1083,7 +1173,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   publisher = {ACM},
   pages = {271--284},
   doi = {10.1145/2535838.2535848},
-  pdf = {<a href="http://software.imdea.org/~gotsman/papers/distrmm-popl14-ext.pdf">http://software.imdea.org/~gotsman/papers/distrmm-popl14-ext.pdf</a>}
+  pdf = {<a href="http://software.imdea.org/~gotsman/papers/distrmm-popl14-ext.pdf">http://software.imdea.org/~gotsman/papers/distrmm-popl14-ext.pdf</a>},
+  keywords = {specification, verification}
 }
 </pre>
 
@@ -1094,7 +1185,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   year = {2018},
   month = may,
   eprint = {1805.04263},
-  url = {https://arxiv.org/abs/1805.04263}
+  url = {https://arxiv.org/abs/1805.04263},
+  keywords = {specification, verification}
 }
 </pre>
 
@@ -1110,7 +1202,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   pages = {371--384},
   numpages = {14},
   doi = {10.1145/2837614.2837625},
-  pdf = {<a href="http://software.imdea.org/~gotsman/papers/logic-popl16.pdf">http://software.imdea.org/~gotsman/papers/logic-popl16.pdf</a>}
+  pdf = {<a href="http://software.imdea.org/~gotsman/papers/logic-popl16.pdf">http://software.imdea.org/~gotsman/papers/logic-popl16.pdf</a>},
+  keywords = {specification, verification}
 }
 </pre>
 
@@ -1125,7 +1218,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   publisher = {ACM},
   pages = {259--268},
   doi = {10.1145/2933057.2933090},
-  pdf = {<a href="http://www.cs.ox.ac.uk/people/hongseok.yang/paper/podc16-full.pdf">http://www.cs.ox.ac.uk/people/hongseok.yang/paper/podc16-full.pdf</a>}
+  pdf = {<a href="http://www.cs.ox.ac.uk/people/hongseok.yang/paper/podc16-full.pdf">http://www.cs.ox.ac.uk/people/hongseok.yang/paper/podc16-full.pdf</a>},
+  keywords = {text-editing, specification, verification}
 }
 </pre>
 
@@ -1139,7 +1233,41 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   month = jun,
   publisher = {USENIX},
   pages = {281--292},
-  url = {https://www.usenix.org/conference/atc14/technical-sessions/presentation/li_cheng_2}
+  url = {https://www.usenix.org/conference/atc14/technical-sessions/presentation/li_cheng_2},
+  keywords = {verification}
+}
+</pre>
+
+<a name="Kollmann2019Snapdoc"></a><pre>
+@article{<a href="papers.html#Kollmann2019Snapdoc">Kollmann2019Snapdoc</a>,
+  author = {Kollmann, Stephan A and Kleppmann, Martin and Beresford, Alastair R},
+  title = {{Snapdoc}: Authenticated snapshots with history privacy in peer-to-peer collaborative editing},
+  journal = {Proceedings on Privacy Enhancing Technologies (PoPETS)},
+  volume = {2019},
+  number = {3},
+  pages = {210--232},
+  year = {2019},
+  month = jul,
+  publisher = {De Gruyter},
+  doi = {10.2478/popets-2019-0044},
+  pdf = {https://www.petsymposium.org/2019/files/papers/issue3/popets-2019-0044.pdf},
+  keywords = {security}
+}
+</pre>
+
+<a name="Truong2012authenticating"></a><pre>
+@inproceedings{<a href="papers.html#Truong2012authenticating">Truong2012authenticating</a>,
+  author = {Truong, Hien Thi Thu and Ignat, Claudia-Lavinia and Molli, Pascal},
+  title = {Authenticating operation-based history in collaborative systems},
+  booktitle = {17th ACM International Conference on Supporting Group Work},
+  series = {GROUP 2012},
+  year = {2012},
+  month = oct,
+  pages = {131--140},
+  publisher = {ACM},
+  doi = {10.1145/2389176.2389197},
+  url = {https://hal.inria.fr/hal-00761045/document},
+  keywords = {security}
 }
 </pre>
 
@@ -1155,7 +1283,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   articleno = {1},
   pages = {1--14},
   doi = {10.1145/2391229.2391230},
-  pdf = {https://www2.eecs.berkeley.edu/Pubs/TechRpts/2012/EECS-2012-167.pdf}
+  pdf = {https://www2.eecs.berkeley.edu/Pubs/TechRpts/2012/EECS-2012-167.pdf},
+  keywords = {crdt-related}
 }
 </pre>
 
@@ -1170,7 +1299,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   pages = {283--307},
   publisher = {Springer LNCS volume 7313},
   doi = {10.1007/978-3-642-31057-7_14},
-  url = {https://www.microsoft.com/en-us/research/wp-content/uploads/2016/02/final-with-color.pdf}
+  url = {https://www.microsoft.com/en-us/research/wp-content/uploads/2016/02/final-with-color.pdf},
+  keywords = {crdt-related}
 }
 </pre>
 
@@ -1185,7 +1315,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   publisher = {Springer LNCS volume 7211},
   pages = {67--86},
   doi = {10.1007/978-3-642-28869-2_4},
-  pdf = {https://www.microsoft.com/en-us/research/wp-content/uploads/2016/02/ecr-esop2012.pdf}
+  pdf = {https://www.microsoft.com/en-us/research/wp-content/uploads/2016/02/ecr-esop2012.pdf},
+  keywords = {crdt-related, transactions}
 }
 </pre>
 
@@ -1200,7 +1331,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   month = oct,
   publisher = {ACM},
   doi = {10.1145/3360580},
-  url = {https://gowthamk.github.io/docs/mrdt.pdf}
+  url = {https://gowthamk.github.io/docs/mrdt.pdf},
+  keywords = {crdt-related}
 }
 </pre>
 
@@ -1212,7 +1344,8 @@ <h1>CRDT Papers</h1><a name="Shapiro2011CRDTs"></a><pre>
   series = {WoDet 2014},
   year = {2014},
   month = mar,
-  url = {<a href="http://wodet.cs.washington.edu/wp-content/uploads/2014/02/wodet2014-final1.pdf">http://wodet.cs.washington.edu/wp-content/uploads/2014/02/wodet2014-final1.pdf</a>}
+  url = {<a href="http://wodet.cs.washington.edu/wp-content/uploads/2014/02/wodet2014-final1.pdf">http://wodet.cs.washington.edu/wp-content/uploads/2014/02/wodet2014-final1.pdf</a>},
+  keywords = {crdt-related, shared-memory concurrency}
 }
 </pre>
 
diff --git a/update.sh b/update.sh
index 615968e..45584b5 100755
--- a/update.sh
+++ b/update.sh
@@ -10,7 +10,11 @@ which bibtex2html > /dev/null || (
 
 bibtex2html --dl --nodoc --title 'CRDT Papers' papers.bib
 
-sed -e $'1s/^/---\\\nlayout: page\\\ntitle: CRDT Papers\\\n---\\\n/' -i '' papers.html
+sed -e $'1s/^/---\\\nlayout: page\\\ntitle: CRDT Papers\\\n---\\\n/' \
+    -e '/<h1>CRDT Papers<\/h1>/ r _includes/papers-filter.html' \
+    -e 's/<\/dl><hr><p><em>This file was generated by.*/<\/dl>/' \
+    -e 's/<a href="http:\/\/www.lri.fr\/~filliatr\/bibtex2html\/">.*//' \
+    -i '' papers.html
 
 sed -e 's/<h1>papers.bib<\/h1>/<h1>CRDT Papers<\/h1>/' \
     -e $'1s/^/<!DOCTYPE html>\\\n<meta charset="utf-8">\\\n/' -i '' papers_bib.html