diff --git a/build.properties.d/00_default.properties b/build.properties.d/00_default.properties
index 2e0dac3c2dca058e7f6f28a888344745a1a54c43..76ce6c7fa0e2f4af1babf6dc3661fe86e0a7bf18 100644
--- a/build.properties.d/00_default.properties
+++ b/build.properties.d/00_default.properties
@@ -50,6 +50,7 @@ BUILD_MODULE_EXT_BOTTOM_LINE=ENABLED
 BUILD_MODULE_EXT_BOTTOM_LINE_TABLE_PREVIEW=DISABLED
 BUILD_MODULE_EXT_BOTTOM_LINE_TIFF_PREVIEW=DISABLED
 BUILD_MODULE_EXT_BOOKMARKS=ENABLED
+BUILD_MODULE_EXT_ANNOTATION=ENABLED
 
 BUILD_MODULE_USER_MANAGEMENT=ENABLED
 BUILD_MODULE_USER_MANAGEMENT_CHANGE_OWN_PASSWORD_REALM=CaosDB
diff --git a/src/core/js/annotation.js b/src/core/js/annotation.js
index dd75a81180d2081fd992d168ff3e1b5f43492f06..42b4217cf2a7c2cd1214d0384ba09a23e2cddaf3 100644
--- a/src/core/js/annotation.js
+++ b/src/core/js/annotation.js
@@ -434,7 +434,7 @@ this.annotation = new function() {
 };
 
 $(document).ready(function() {
-    //if ("${BUILD_MODULE_EXT_ANNOTATION}" == "ENABLED") {
+    if ("${BUILD_MODULE_EXT_ANNOTATION}" == "ENABLED") {
         caosdb_modules.register(annotation);
-    //}
+    }
 });
diff --git a/src/core/js/ext_autocomplete.js b/src/core/js/ext_autocomplete.js
index 080fc37f7f98840073e178405922aa10fed25ed1..9a639fb4387a32bad128406bb7bd1f036bed5fda 100644
--- a/src/core/js/ext_autocomplete.js
+++ b/src/core/js/ext_autocomplete.js
@@ -181,6 +181,9 @@ var ext_autocomplete = new function () {
             },
             noResultsText: 'No autocompletion suggestions',
             bootstrapVersion: "4",
+            /* this should be updated to 5 when
+                     bootstrap-autocomplete releases official support for bootstrap 5.
+                     Until then: let's hope the best.*/
 
         });