diff --git a/src/components/basicUIElements/view/placeHolder/boostPlaceHolderView.js b/src/components/basicUIElements/view/placeHolder/boostPlaceHolderView.js
index ff90a6442..d2c58295c 100644
--- a/src/components/basicUIElements/view/placeHolder/boostPlaceHolderView.js
+++ b/src/components/basicUIElements/view/placeHolder/boostPlaceHolderView.js
@@ -20,7 +20,7 @@ const BoostPlaceHolder = () => {
         {({ isDarkTheme }) => {
           const color = isDarkTheme ? '#2e3d51' : '#f5f5f5';
           return (
-            <View style={styles.container} key={i.toString()}>
+            <View style={styles.container} key={'key-' + i.toString()}>
               <View style={styles.line}>
                 <Placeholder.Box color={color} width={90} height={40} animate="fade" />
                 <View style={styles.paragraphWrapper}>
diff --git a/src/components/editorElements/tagArea/view/tagAreaView.js b/src/components/editorElements/tagArea/view/tagAreaView.js
index 273909d3c..177efa63d 100644
--- a/src/components/editorElements/tagArea/view/tagAreaView.js
+++ b/src/components/editorElements/tagArea/view/tagAreaView.js
@@ -131,8 +131,8 @@ export default class TagAreaView extends Component {
                   }}
                   isPin={i === 0 && chips[1]}
                   placeholderTextColor="#fff"
-                  removeButton
-                  handleOnRemoveButtonPress={() => this._handleTagRemove(i)}
+                  //removeButton
+                  //handleOnRemoveButtonPress={() => this._handleTagRemove(i)}
                   editable={!isPreviewActive}
                   maxLength={50}
                   placeholder="tags"
diff --git a/src/components/postElements/body/view/commentBodyView.js b/src/components/postElements/body/view/commentBodyView.js
index 4479e7f22..5ca509864 100644
--- a/src/components/postElements/body/view/commentBodyView.js
+++ b/src/components/postElements/body/view/commentBodyView.js
@@ -216,7 +216,7 @@ const CommentBody = ({
   a {
     color: ${EStyleSheet.value('$primaryBlue')};
     cursor: pointer;
-    text-decoration: underline;
+    margin-right: 5;
   }
   img {
     align-self: 'center';
diff --git a/src/components/postElements/body/view/postBodyView.js b/src/components/postElements/body/view/postBodyView.js
index 4e2e24bac..c382dc392 100644
--- a/src/components/postElements/body/view/postBodyView.js
+++ b/src/components/postElements/body/view/postBodyView.js
@@ -213,7 +213,7 @@ const PostBody = ({
   a {
     color: ${EStyleSheet.value('$primaryBlue')};
     cursor: pointer;
-    text-decoration: underline;
+    margin-right: 5;
   }
   img {
     align-self: 'center';
diff --git a/src/screens/boost/screen/boostScreen.js b/src/screens/boost/screen/boostScreen.js
index a24047c14..cbd4f2d7f 100644
--- a/src/screens/boost/screen/boostScreen.js
+++ b/src/screens/boost/screen/boostScreen.js
@@ -19,9 +19,8 @@ const ITEM_SKUS = Platform.select({
 
 const _getTitle = title => {
   let _title = title.toUpperCase();
-
-  if (_title.includes('(ESTEEM)')) {
-    _title = _title.replace('(ESTEEM)', '');
+  if (_title !== 'FREE ESTM') {
+    _title = _title.replace(/[^0-9]+/g, '') + ' ESTM';
   }
 
   return _title;
diff --git a/src/screens/editor/screen/editorScreen.js b/src/screens/editor/screen/editorScreen.js
index 2fa607844..a2b94f8fe 100644
--- a/src/screens/editor/screen/editorScreen.js
+++ b/src/screens/editor/screen/editorScreen.js
@@ -228,7 +228,7 @@ class EditorScreen extends Component {
           {!isReply && (
             <TitleArea value={fields.title} componentID="title" intl={intl} autoFocus={true} />
           )}
-          {!isReply && (
+          {!isReply && !isPreviewActive && (
             <TagInput
               value={fields.tags}
               componentID="tag-area"
@@ -236,6 +236,13 @@ class EditorScreen extends Component {
               handleTagChanged={this._handleOnTagAdded}
             />
           )}
+          {!isReply && isPreviewActive && (
+            <TagArea
+              draftChips={fields.tags.length > 0 ? fields.tags : null}
+              componentID="tag-area"
+              intl={intl}
+            />
+          )}
           <MarkdownEditor
             componentID="body"
             draftBody={fields && fields.body}
@@ -257,12 +264,3 @@ class EditorScreen extends Component {
 }
 
 export default injectIntl(EditorScreen);
-/*
-<TagArea
-              draftChips={fields.tags.length > 0 ? fields.tags : null}
-              isRemoveTag={isRemoveTag}
-              componentID="tag-area"
-              handleTagChanged={this._handleOnTagAdded}
-              intl={intl}
-            />
-*/