diff --git a/commit.txt b/commit.txt
deleted file mode 100644
index ce039ff3f98ede4e9981a11da025d92fe8c76f9a..0000000000000000000000000000000000000000
--- a/commit.txt
+++ /dev/null
@@ -1 +0,0 @@
-revision of the tool-tips and the translation
\ No newline at end of file
diff --git a/src/app/components/shared/_dialogs/cloud-configuration/cloud-configuration.component.ts b/src/app/components/shared/_dialogs/cloud-configuration/cloud-configuration.component.ts
index cadc923e9e28020da74c6d3a2883653d36388c81..967d2ec047c2d61c518879936031d481707c72fb 100644
--- a/src/app/components/shared/_dialogs/cloud-configuration/cloud-configuration.component.ts
+++ b/src/app/components/shared/_dialogs/cloud-configuration/cloud-configuration.component.ts
@@ -100,6 +100,9 @@ export class CloudConfigurationComponent implements OnInit {
     this.cloudParameters = this.parent.currentCloudParameters;
     this.defaultCloudParameters = this.parent.currentCloudParameters;
     this.parent.dataManager.getMetaData().subscribe((value)=>{
+      if (!value) {
+        return;
+      }
       this.countPerWeight = value.countPerWeight;
       this.parseArrayToJsonWeightClasses();
     });
diff --git a/src/app/components/shared/comment-list/comment-list.component.ts b/src/app/components/shared/comment-list/comment-list.component.ts
index f1c5032d3f8c00dc828e2c0036222822cf299606..967ff70fc74be02627932e551c1e63d8c00816db 100644
--- a/src/app/components/shared/comment-list/comment-list.component.ts
+++ b/src/app/components/shared/comment-list/comment-list.component.ts
@@ -133,6 +133,7 @@ export class CommentListComponent implements OnInit, OnDestroy {
 
   initNavigation() {
     this._subscriptionEventServiceTagConfig = this.eventService.on<string>('setTagConfig').subscribe(tag => {
+      this.setTimePeriod(Period.all);
       this.clickedOnKeyword(tag);
     });
     this._subscriptionEventServiceRoomData = this.eventService.on<string>('pushCurrentRoomData').subscribe(_ => {
@@ -395,7 +396,9 @@ export class CommentListComponent implements OnInit, OnDestroy {
           return c.userNumber === compare;
         case this.keyword:
           this.selectedKeyword = compare;
-          return c.keywordsFromQuestioner ? c.keywordsFromQuestioner.includes(compare) : false;
+          const isInQuestioner = c.keywordsFromQuestioner ? c.keywordsFromQuestioner.includes(compare) : false;
+          const isInSpacy = c.keywordsFromSpacy ? c.keywordsFromSpacy.includes(compare) : false;
+          return isInQuestioner || isInSpacy;
         case this.answer:
           return c.answer;
         case this.unanswered:
diff --git a/src/app/components/shared/tag-cloud/tag-cloud.component.ts b/src/app/components/shared/tag-cloud/tag-cloud.component.ts
index a75007d8a8441e15adf7706319dc7b1224505971..37c401a931362c0a318d7b32b23fb187b34e1a0e 100644
--- a/src/app/components/shared/tag-cloud/tag-cloud.component.ts
+++ b/src/app/components/shared/tag-cloud/tag-cloud.component.ts
@@ -237,10 +237,16 @@ export class TagCloudComponent implements OnInit, OnDestroy, AfterContentInit, A
         });
       }
     });
-    this.dataManager.getData().subscribe(_ => {
+    this.dataManager.getData().subscribe(data => {
+      if (!data) {
+        return;
+      }
       this.rebuildData();
     });
     this.dataManager.getMetaData().subscribe(data => {
+      if (!data) {
+        return;
+      }
       this.eventService.broadcast('tagCloudHeaderDataOverview', data);
     });
     this.authenticationService.watchUser.subscribe(newUser => {
diff --git a/src/app/services/util/tag-cloud-data.service.ts b/src/app/services/util/tag-cloud-data.service.ts
index 07fb647467c658e3ed2dc3dbec70508a26c8e83a..8509c510737cb4a2c2f5a462346bdc371a2b07e7 100644
--- a/src/app/services/util/tag-cloud-data.service.ts
+++ b/src/app/services/util/tag-cloud-data.service.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { TopicCloudAdminData } from '../../components/shared/_dialogs/topic-cloud-administration/TopicCloudAdminData';
-import { Observable, Subject, Subscription } from 'rxjs';
+import { BehaviorSubject, Observable, Subject, Subscription } from 'rxjs';
 import { TopicCloudAdminService } from './topic-cloud-admin.service';
 import { CommentFilter } from '../../utils/filter-options';
 import { TranslateService } from '@ngx-translate/core';
@@ -65,8 +65,8 @@ export enum TagCloudCalcWeightType {
 export class TagCloudDataService {
   private _isDemoActive: boolean;
   private _isAlphabeticallySorted: boolean;
-  private _dataBus: Subject<TagCloudData>;
-  private _metaDataBus: Subject<TagCloudMetaData>;
+  private _dataBus: BehaviorSubject<TagCloudData>;
+  private _metaDataBus: BehaviorSubject<TagCloudMetaData>;
   private _cachedData: TagCloudData;
   private _commentSubscription = null;
   private _roomId = null;
@@ -85,7 +85,7 @@ export class TagCloudDataService {
               private _roomDataService: RoomDataService) {
     this._isDemoActive = false;
     this._isAlphabeticallySorted = false;
-    this._dataBus = new Subject<TagCloudData>();
+    this._dataBus = new BehaviorSubject<TagCloudData>(null);
     this._currentMetaData = {
       tagCount: 0,
       commentCount: 0,
@@ -94,7 +94,7 @@ export class TagCloudDataService {
       maxWeight: 0,
       countPerWeight: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
     };
-    this._metaDataBus = new Subject<TagCloudMetaData>();
+    this._metaDataBus = new BehaviorSubject<TagCloudMetaData>(null);
     this._cachedData = null;
     // Subscribe to own 'service' for caching
     this._dataBus.asObservable().subscribe(data => {