diff --git a/CHANGELOG.md b/CHANGELOG.md
index dcabc44bbaddc5f4f49931a3d1bd60e943f2dd47..f6a7a87c4c3f83dac53c4a3ba21a983f9c551bbb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added (for new features, dependecies etc.)
 
+* `ext_cosmetics` module which converts http(s) uris in property values into
+  clickable links.
 * Displaying and interacting with the entity state.
 * Change password functionality for users of the internal user source.
 * Visually highlighted drop zones for properties and parents in the edit_mode.
diff --git a/src/core/js/ext_cosmetics.js b/src/core/js/ext_cosmetics.js
index 26231e1a61df6e11ce914da6eb06a058daca2485..4d935a2a5afecd699fee1a24416c06b30d1adc46 100644
--- a/src/core/js/ext_cosmetics.js
+++ b/src/core/js/ext_cosmetics.js
@@ -30,6 +30,7 @@ var cosmetics = new function () {
 
     var _linkify = function () {
         $('.caosdb-f-property-text-value').each(function (index) {
+            // TODO also extract and convert links surrounded by other text
             if (/^https?:\/\//.test(this.innerText)) {
                 var uri = this.innerText;
                 var text = uri