diff --git a/bin/Controls/CustomerReviews.Settings.html b/bin/Controls/CustomerReviews.Settings.html
index 7bc7cd1ba1fab65ef08596523668f56e9ccda3f0..717a1c911ec2cce9d0c02835ef37ebb25badc1a0 100644
--- a/bin/Controls/CustomerReviews.Settings.html
+++ b/bin/Controls/CustomerReviews.Settings.html
@@ -21,7 +21,6 @@
     </label>
     <label>
         <span class="entry-title">{{review}}</span>
-        <input name="content" class="field-container-field field-description" data-qui="controls/editors/Input"/>
+        <input name="customerReviewsContent" class="field-container-field field-description" data-qui="controls/editors/Input"/>
     </label>
-
 </div>
\ No newline at end of file
diff --git a/bin/Controls/CustomerReviews.js b/bin/Controls/CustomerReviews.js
index 32c9d467358b0970278cc1107766bad80ff7ef2e..07e467030931b69f4defe8267dac93580bbfc458 100644
--- a/bin/Controls/CustomerReviews.js
+++ b/bin/Controls/CustomerReviews.js
@@ -52,6 +52,35 @@ define('package/quiqqer/bricks/bin/Controls/CustomerReviews', [
             });
         },
 
+        /**
+         * @event on import
+         *
+         * https://dev.quiqqer.com/quiqqer/package-bricks/issues/97
+         */
+        $onImport: function () {
+            // look if some value exist
+            var value = this.getElm().value;
+
+            if (value === '') {
+                return;
+            }
+
+            value = JSON.decode(value);
+
+            if (typeOf(value) !== 'array') {
+                return;
+            }
+
+            for (var i = 0, len = value.length; i < len; i++) {
+                if (typeof value[i].content !== 'undefined') {
+                    value[i].customerReviewsContent = value[i].content;
+                }
+            }
+
+            this.getElm().value = JSON.encode(value);
+            this.parent();
+        },
+
         /**
          * set the project to the control
          *
diff --git a/src/QUI/Bricks/Controls/CustomerReviews.SmallBoxes.html b/src/QUI/Bricks/Controls/CustomerReviews.SmallBoxes.html
index 1d105b2cefde6668d1a1df37064ffaaa1478be4b..00710e13de78229c3eda8da8a8220f68d6bd9a1f 100644
--- a/src/QUI/Bricks/Controls/CustomerReviews.SmallBoxes.html
+++ b/src/QUI/Bricks/Controls/CustomerReviews.SmallBoxes.html
@@ -25,7 +25,14 @@
 
     <div class="customer-review customer-review-{$modKey} control-template" {if $title}title="{$title}"{/if}>
         <div class="customer-review-content">
-            {$entry.content}
+            {* Fix content issue *}
+            {* https://dev.quiqqer.com/quiqqer/package-bricks/issues/97 *}
+            {if isset($entry['content']) && $entry['content']}
+                {$entry['content']}
+            {else if isset($entry['customerReviewsContent']) && $entry['customerReviewsContent']}
+                {$entry['customerReviewsContent']}
+            {/if}
+            {* end fix *}
         </div>
         <div class="customer-review-footer">
             <div class="customer-review-footer-image">
diff --git a/src/QUI/Bricks/Controls/CustomerReviews.WideBoxes.html b/src/QUI/Bricks/Controls/CustomerReviews.WideBoxes.html
index 4a604e9df3c291c963eb3e537aeea89bb1d9c0d8..9cf1c91cec29a6cf72178ec01cb5d7116a0f0323 100644
--- a/src/QUI/Bricks/Controls/CustomerReviews.WideBoxes.html
+++ b/src/QUI/Bricks/Controls/CustomerReviews.WideBoxes.html
@@ -32,7 +32,14 @@
         </div>
         <div class="customer-review-content">
             <div class="customer-review-content-text">
-                {$entry.content}
+                {* Fix content issue *}
+                {* https://dev.quiqqer.com/quiqqer/package-bricks/issues/97 *}
+                {if isset($entry['content']) && $entry['content']}
+                    {$entry['content']}
+                {else if isset($entry['customerReviewsContent']) && $entry['customerReviewsContent']}
+                    {$entry['customerReviewsContent']}
+                {/if}
+                {* end fix *}
             </div>
             <div class="customer-review-content-footer">
                 {if $entry.userName}
@@ -45,6 +52,7 @@
                     {$entry.jobTitle}
                 </span>
                 {/if}
+
                 {if $entry.url}
                 <span class="customer-review-content-footer-url">
                     <a href="{$entry.url}" title="{$entry.url}" target="_blank" rel="nofollow">