diff --git a/.circleci/config.yml b/.circleci/config.yml
index c62ca62fbe..968598bb1c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -361,7 +361,7 @@ workflows:
           filters:
             branches:
               only:
-                - thrive-bug-fixes
+                - thrive-bug-fixes2
       # This is stage env for production QA releases
       - "build-prod-staging":
           context : org-global         
diff --git a/src/assets/images/tc-edu/icon-radio-checked.svg b/src/assets/images/tc-edu/icon-radio-checked.svg
index 637cb4572f..daa69c9e5c 100644
--- a/src/assets/images/tc-edu/icon-radio-checked.svg
+++ b/src/assets/images/tc-edu/icon-radio-checked.svg
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="15px" height="15px" viewBox="0 0 15 15" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 52.5 (67469) - http://www.bohemiancoding.com/sketch -->
-    <title>UI Kit/Selects/Checkbox LG/selected</title>
-    <desc>Created with Sketch.</desc>
     <defs>
         <filter x="-10.0%" y="-10.0%" width="120.0%" height="120.0%" filterUnits="objectBoundingBox" id="tc-edu-icon-radio-checked-filter-2">
             <feGaussianBlur stdDeviation="1" in="SourceAlpha" result="shadowBlurInner1"></feGaussianBlur>
diff --git a/src/assets/images/tc-edu/icon-radio-un-check.svg b/src/assets/images/tc-edu/icon-radio-un-check.svg
index ea6ffc7e4c..67bd780a9a 100644
--- a/src/assets/images/tc-edu/icon-radio-un-check.svg
+++ b/src/assets/images/tc-edu/icon-radio-un-check.svg
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="15px" height="15px" viewBox="0 0 15 15" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 52.5 (67469) - http://www.bohemiancoding.com/sketch -->
-    <title>UI Kit/Selects/Checkbox LG/selected</title>
-    <desc>Created with Sketch.</desc>
+    <title>Click to select category</title>
     <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="D02_6_Search-Result" transform="translate(-30.000000, -473.000000)" fill="#FFFFFF" stroke="#AAAAAA">
             <g id="Group-15" transform="translate(20.000000, 321.000000)">
diff --git a/src/shared/components/Contentful/SearchBar/SearchBar.jsx b/src/shared/components/Contentful/SearchBar/SearchBar.jsx
index d23301d0ed..3fe97914e3 100644
--- a/src/shared/components/Contentful/SearchBar/SearchBar.jsx
+++ b/src/shared/components/Contentful/SearchBar/SearchBar.jsx
@@ -324,7 +324,7 @@ export class SearchBarInner extends Component {
                     <a className={theme.authorLink} href={`${config.TC_EDU_BASE_PATH}${config.TC_EDU_SEARCH_PATH}?author=${item.name}`}>
                       {item.tcHandle}
                       {
-                        item.tcHandle ? (
+                        item.name ? (
                           <span className={theme.authorName}>
                             {item.name}
                           </span>
diff --git a/src/shared/components/Contentful/SearchPageFilter/FilterAuthor/index.jsx b/src/shared/components/Contentful/SearchPageFilter/FilterAuthor/index.jsx
index e9a5dc0e91..3629181030 100644
--- a/src/shared/components/Contentful/SearchPageFilter/FilterAuthor/index.jsx
+++ b/src/shared/components/Contentful/SearchPageFilter/FilterAuthor/index.jsx
@@ -72,7 +72,7 @@ export class FilterAuthorInner extends Component {
           }}
         >
           <span>{selected}</span>
-          <IconArrow className={theme['icon-arrow']} />
+          <IconArrow className={theme[isShowPopup ? 'icon-arrow-popup' : 'icon-arrow']} />
         </button>
         {isShowPopup && (
           <div className={theme.popup}>
diff --git a/src/shared/components/Contentful/SearchPageFilter/FilterAuthor/themes/default.scss b/src/shared/components/Contentful/SearchPageFilter/FilterAuthor/themes/default.scss
index 58f5227028..46a667792b 100644
--- a/src/shared/components/Contentful/SearchPageFilter/FilterAuthor/themes/default.scss
+++ b/src/shared/components/Contentful/SearchPageFilter/FilterAuthor/themes/default.scss
@@ -53,6 +53,17 @@ $text-black: #2a2a2a;
   }
 }
 
+.icon-arrow-popup {
+  -moz-transform: none;
+  -o-transform: none;
+  -webkit-transform: none;
+  transform: none;
+
+  polygon {
+    fill: #aaa;
+  }
+}
+
 .popup {
   position: absolute;
   left: 0;
diff --git a/src/shared/components/Contentful/SearchPageFilter/FilterRadio/themes/default.scss b/src/shared/components/Contentful/SearchPageFilter/FilterRadio/themes/default.scss
index 9e362e6ae3..bca87726ac 100644
--- a/src/shared/components/Contentful/SearchPageFilter/FilterRadio/themes/default.scss
+++ b/src/shared/components/Contentful/SearchPageFilter/FilterRadio/themes/default.scss
@@ -28,5 +28,6 @@ $text-black: #2a2a2a;
 
   span {
     margin-left: 11px;
+    cursor: default;
   }
 }
diff --git a/src/shared/components/Contentful/SearchPageFilter/FilterTags/index.jsx b/src/shared/components/Contentful/SearchPageFilter/FilterTags/index.jsx
index 547e293f5e..e8465a691d 100644
--- a/src/shared/components/Contentful/SearchPageFilter/FilterTags/index.jsx
+++ b/src/shared/components/Contentful/SearchPageFilter/FilterTags/index.jsx
@@ -66,11 +66,12 @@ export class FilterTagsInner extends Component {
           value={inputValue}
           onChange={(e) => { this.setState({ inputValue: e.target.value }); }}
           onKeyDown={(e) => {
-            if (e.key === 'Enter' && inputValue && inputValue.trim() && !isTagExist(inputValue)) {
+            if (e.key === 'Enter' && inputValue && inputValue.trim() && !isTagExist(inputValue) && tags.length <= 4) {
               onAddNewTag(inputValue);
               this.setState({ inputValue: '' });
             }
           }}
+          maxLength="40"
         />
         <div className={theme['tag-container']}>
           {
diff --git a/src/shared/components/Contentful/TracksFilter/TracksTags/index.jsx b/src/shared/components/Contentful/TracksFilter/TracksTags/index.jsx
index 7531e8cd4a..88d6db9101 100644
--- a/src/shared/components/Contentful/TracksFilter/TracksTags/index.jsx
+++ b/src/shared/components/Contentful/TracksFilter/TracksTags/index.jsx
@@ -85,6 +85,7 @@ export class TracksTagsInner extends Component {
             type="text"
             className={theme['tags-field']}
             placeholder="Add tags to filter content..."
+            maxLength="40"
           />
         </div>
       </div>