diff --git a/CHANGELOG.md b/CHANGELOG.md
index 92a4141b1107624395a972f5063e01eae52ddb4b..f0f46cddce0ffcd2450c3ec8bcc5b6693b2161c5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,23 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [Unpublished]
+
+### Added (for new features, dependecies etc.)
+
+### Changed (for changes in existing functionality)
+
+### Deprecated (for soon-to-be removed features)
+
+### Removed (for now removed features)
+
+### Fixed (for any bug fixes)
+
+### Security (in case of vulnerabilities)
+
+### Documentation (for notable additions or changes of the documentation)
+
+## [0.4.2] - 2021-12-06
 
 ### Added (for new features, dependecies etc.)
 
@@ -21,6 +37,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Optional WYSIWYG editor with markdown output for text properties. Controled by
   the `BUILD_MODULE_EXT_EDITMODE_WYSIWYG_TEXT` build variable which is set do
   `DISABLED` by default.
+  - Added button to version history panel that allows restoring old versions
 
 ### Changed (for changes in existing functionality)
 
@@ -35,6 +52,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   `src/ext/html/` and link to that.
 
 ### Fixed (for any bug fixes)
+- #156
+- #251
 
 ### Security (in case of vulnerabilities)
 
diff --git a/RELEASE_GUIDELINES.md b/RELEASE_GUIDELINES.md
index 1dc6d11a442b9f095d7e80b02a3a9542e62b8e98..9dd648c235258b052332212bd906525e87863629 100644
--- a/RELEASE_GUIDELINES.md
+++ b/RELEASE_GUIDELINES.md
@@ -1,4 +1,4 @@
-# Release Guidelines for the CaosDB MySQL Backend
+# Release Guidelines for the CaosDB Web Interface
 
 This document specifies release guidelines in addition to the generel release
 guidelines of the CaosDB Project
@@ -8,7 +8,7 @@ guidelines of the CaosDB Project
 
 * All tests are passing.
 * FEATURES.md is up-to-date and a public API is being declared in that document.
-* CHANGELOG.md is up-to-date.
+* CHANGELOG.md is up-to-date (insert version number and remove unpublished)
 * DEPENDENCIES.md is up-to-date.
 
 ## Steps
@@ -25,3 +25,5 @@ guidelines of the CaosDB Project
 5. Delete the release branch.
 
 6. Merge the main branch back into the dev branch.
+
+7. Prepare CHANGELOG for next release cycle.
diff --git a/src/core/js/ext_editmode_wysiwyg_text.js b/src/core/js/ext_editmode_wysiwyg_text.js
index 380d8b1ec298ed0fa5c68af50b8b0e9dad333b89..f784dbd5d998ffeb95b4d594c907ff725441eadd 100644
--- a/src/core/js/ext_editmode_wysiwyg_text.js
+++ b/src/core/js/ext_editmode_wysiwyg_text.js
@@ -45,7 +45,7 @@ var ext_editmode_wysiwyg_text = function ($, logger, ClassicEditor, edit_mode, g
             return;
         }
 
-        try{
+        try {
             const editor = await ClassicEditor
                 .create(prop.querySelector('textarea'), {
                     // use all plugins since we built the editor dependency to
@@ -65,7 +65,7 @@ var ext_editmode_wysiwyg_text = function ($, logger, ClassicEditor, edit_mode, g
             editor.model.document.on("change:data", (e) => {
                 editor.updateSourceElement();
             });
-        } catch(error) {
+        } catch (error) {
             logger.error(error.stack);
         }
     }
@@ -82,6 +82,11 @@ var ext_editmode_wysiwyg_text = function ($, logger, ClassicEditor, edit_mode, g
     }
 
     var init = function () {
+        if (edit_mode.app && edit_mode.app.entity) {
+            // replace text areas if we're already in the edit mode and all
+            // events did fire already.
+            replaceTextAreas(edit_mode.app.entity);
+        }
 
         // Insert an editor into all TEXT properties of the entity which is
         // being edited.