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 d3bc5c015ca9c8b0fd5169da9d89d6b98f00e8f9..c0a1b088da912496577294a6ab81faf240427c60 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
@@ -134,13 +134,13 @@ export class CloudConfigurationComponent implements OnInit {
        this.weightClasses[i].tagColor = element.color;
        this.weightClasses[i].actualTagNumber = this.countPerWeight[i];
        this.weightClasses[i].rotationAngle = element.rotation;
-       this.weightClasses[i].maxTagNumber = element.maxVisibleElements == -1 ? this.weightClasses[i].actualTagNumber : element.maxVisibleElements;
+       this.weightClasses[i].maxTagNumber = (element.maxVisibleElements == -1 || element.maxVisibleElements == 0) ? this.weightClasses[i].actualTagNumber : element.maxVisibleElements;
     });
   }
 
   parseJsonToArrayWeightClasses() {
     this.weightClasses.forEach((element, i) => {
-      this.cloudParameters.cloudWeightSettings[i].maxVisibleElements = element.maxTagNumber;
+      this.cloudParameters.cloudWeightSettings[i].maxVisibleElements = element.maxTagNumber == 0 ? -1 : element.maxTagNumber;
       this.cloudParameters.cloudWeightSettings[i].color = element.tagColor;
       this.cloudParameters.cloudWeightSettings[i].rotation = element.rotationAngle;
     });
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 169b0ebc34ceacc4b4f668ccbd17a02b254dce5b..2e4c2dfe0ebf51f0a8206322598a0b8ebff9a7ab 100644
--- a/src/app/components/shared/tag-cloud/tag-cloud.component.ts
+++ b/src/app/components/shared/tag-cloud/tag-cloud.component.ts
@@ -113,20 +113,20 @@ const getResolvedDefaultColors = (): string[] => {
 const getDefaultCloudParameters = (): CloudParameters => {
   const resDefaultColors = getResolvedDefaultColors();
   const weightSettings: CloudWeightSettings = [
-    {maxVisibleElements: 5, color: resDefaultColors[1], rotation: 0},
-    {maxVisibleElements: 6, color: resDefaultColors[2], rotation: 0},
-    {maxVisibleElements: 5, color: resDefaultColors[3], rotation: 0},
-    {maxVisibleElements: 6, color: resDefaultColors[4], rotation: 0},
-    {maxVisibleElements: 5, color: resDefaultColors[5], rotation: 0},
-    {maxVisibleElements: 6, color: resDefaultColors[6], rotation: 0},
-    {maxVisibleElements: 5, color: resDefaultColors[7], rotation: 0},
-    {maxVisibleElements: 6, color: resDefaultColors[8], rotation: 0},
-    {maxVisibleElements: 5, color: resDefaultColors[9], rotation: 0},
-    {maxVisibleElements: 6, color: resDefaultColors[10], rotation: 0},
+    {maxVisibleElements: -1, color: resDefaultColors[1], rotation: 0},
+    {maxVisibleElements: -1, color: resDefaultColors[2], rotation: 0},
+    {maxVisibleElements: -1, color: resDefaultColors[3], rotation: 0},
+    {maxVisibleElements: -1, color: resDefaultColors[4], rotation: 0},
+    {maxVisibleElements: -1, color: resDefaultColors[5], rotation: 0},
+    {maxVisibleElements: -1, color: resDefaultColors[6], rotation: 0},
+    {maxVisibleElements: -1, color: resDefaultColors[7], rotation: 0},
+    {maxVisibleElements: -1, color: resDefaultColors[8], rotation: 0},
+    {maxVisibleElements: -1, color: resDefaultColors[9], rotation: 0},
+    {maxVisibleElements: -1, color: resDefaultColors[10], rotation: 0},
   ];
   return {
     fontFamily: 'Dancing Script',
-    fontWeight: 'bold',
+    fontWeight: 'normal',
     fontStyle: 'normal',
     fontSize: '10px',
     backgroundColor: resDefaultColors[11],
@@ -137,7 +137,7 @@ const getDefaultCloudParameters = (): CloudParameters => {
     hoverTime: 0.6,
     hoverDelay: 0.4,
     delayWord: 0,
-    randomAngles: true,
+    randomAngles: false,
     sortAlphabetically: false,
     textTransform: CloudTextStyle.normal,
     cloudWeightSettings: weightSettings