diff --git a/.circleci/config.yml b/.circleci/config.yml
index e3e0ca64d6..dc1b4033dd 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -260,7 +260,6 @@ workflows:
             branches:
               only:
                 - develop
-                - search-whitespace
       # Production builds are exectuted 
       # when PR is merged to the master
       # Don't change anything in this configuration
diff --git a/src/assets/images/profile/skills/id-118.svg b/src/assets/images/profile/skills/id-118.svg
new file mode 100644
index 0000000000..891a327014
--- /dev/null
+++ b/src/assets/images/profile/skills/id-118.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFCC06;}
+	.st1{fill:#65C9D3;}
+	.st2{fill:#EE376D;}
+</style>
+<g>
+	<path class="st0" d="M44.8,29.6c-0.3,0.8-0.7,1.5-1.1,2.3C39.4,26.4,33,22.7,26,21.8c-1.2-0.2-2.4-0.2-3.6-0.2
+		c-6.3,0-12.4,2.2-17.2,6.2C7.7,13,21.5,3,36.3,5.3c1.8,0.3,3.6,0.8,5.3,1.4c1.1,0.4,2.1,0.9,3.1,1.4l0,0c0.6,1.3,1,2.6,1.4,4
+		C47.6,17.9,47.2,24.1,44.8,29.6z"/>
+	<path class="st1" d="M41.5,57.3C27.6,62.5,12,55.5,6.7,41.5c-0.6-1.7-1.1-3.5-1.4-5.3C5.1,35.3,5,34.3,5,33.3l0,0
+		c4.4-6.1,11.1-10.2,18.5-11.1c0.8-0.1,1.6-0.2,2.5-0.2c-5.5,13.9,1.2,29.6,15.1,35.1C41.2,57.1,41.4,57.2,41.5,57.3L41.5,57.3z"/>
+	<path class="st2" d="M59,32c0,8-3.6,15.7-9.8,20.8c-1,0.9-2.2,1.7-2.8,2C39,54,32.1,50.2,27.6,44.2c-0.5-0.7-1-1.3-1.4-2.1
+		c13.4-1.8,23.4-13.2,23.4-26.8c0-1.4-0.1-2.8-0.3-4.2C55.4,16.3,59,24,59,32z"/>
+</g>
+</svg>
diff --git a/src/assets/images/profile/skills/id-556.svg b/src/assets/images/profile/skills/id-556.svg
new file mode 100644
index 0000000000..891a327014
--- /dev/null
+++ b/src/assets/images/profile/skills/id-556.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFCC06;}
+	.st1{fill:#65C9D3;}
+	.st2{fill:#EE376D;}
+</style>
+<g>
+	<path class="st0" d="M44.8,29.6c-0.3,0.8-0.7,1.5-1.1,2.3C39.4,26.4,33,22.7,26,21.8c-1.2-0.2-2.4-0.2-3.6-0.2
+		c-6.3,0-12.4,2.2-17.2,6.2C7.7,13,21.5,3,36.3,5.3c1.8,0.3,3.6,0.8,5.3,1.4c1.1,0.4,2.1,0.9,3.1,1.4l0,0c0.6,1.3,1,2.6,1.4,4
+		C47.6,17.9,47.2,24.1,44.8,29.6z"/>
+	<path class="st1" d="M41.5,57.3C27.6,62.5,12,55.5,6.7,41.5c-0.6-1.7-1.1-3.5-1.4-5.3C5.1,35.3,5,34.3,5,33.3l0,0
+		c4.4-6.1,11.1-10.2,18.5-11.1c0.8-0.1,1.6-0.2,2.5-0.2c-5.5,13.9,1.2,29.6,15.1,35.1C41.2,57.1,41.4,57.2,41.5,57.3L41.5,57.3z"/>
+	<path class="st2" d="M59,32c0,8-3.6,15.7-9.8,20.8c-1,0.9-2.2,1.7-2.8,2C39,54,32.1,50.2,27.6,44.2c-0.5-0.7-1-1.3-1.4-2.1
+		c13.4-1.8,23.4-13.2,23.4-26.8c0-1.4-0.1-2.8-0.3-4.2C55.4,16.3,59,24,59,32z"/>
+</g>
+</svg>
diff --git a/src/assets/images/profile/skills/id-602.svg b/src/assets/images/profile/skills/id-602.svg
new file mode 100644
index 0000000000..2479cdaae0
--- /dev/null
+++ b/src/assets/images/profile/skills/id-602.svg
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);}
+	.st1{fill:#FFFFFF;}
+	.st2{fill:#444444;}
+</style>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="-265.1658" y1="1136.2094" x2="-221.9135" y2="1136.2094" gradientTransform="matrix(0 1 1 0 -1104.2094 270.0874)">
+	<stop  offset="0" style="stop-color:#67AAD7"/>
+	<stop  offset="1" style="stop-color:#EDE61E"/>
+</linearGradient>
+<path class="st0" d="M48.2,40.1c2-1.2,3.7-4,3.7-6.3V19.4c0-2.3-1.7-5.1-3.7-6.3L35.6,5.9c-2-1.2-5.2-1.2-7.2,0l-12.6,7.2
+	c-2,1.2-3.7,4-3.7,6.3v14.5c0,2.3,1.7,5.1,3.7,6.3l12.6,7.2c2,1.2,5.2,1.2,7.2,0L48.2,40.1z"/>
+<path class="st1" d="M22.9,15.8c0,0,0,7.9,0,13.4s4.9,8.5,9.3,8.5s8.9-3.2,8.9-8.5c0-4,0-10.7,0-10.7s-1.3-0.1-2.2,0.7
+	c-0.9,0.7-1.5,1.6-1.5,2.7c0,1.1,0,4.2,0,7.3c0,2.9-2.3,5.1-5.2,5.1c-3.2,0-5.6-2.2-5.6-5.1c0-3.6,0-8.5,0-9.9s-1-2.4-1.5-2.8
+	C24.1,15.8,22.9,15.8,22.9,15.8z"/>
+<g>
+	<path class="st2" d="M19.2,57.1h-2.8l-0.7,1.7h-0.9l2.6-6.7h0.8l2.6,6.7h-0.8L19.2,57.1z M16.7,56.4H19l-1.2-3.2L16.7,56.4z"/>
+	<path class="st2" d="M22.6,56.3V59h-0.9v-6.7h2.6c0.4,0,0.7,0,1.1,0.1c0.3,0.1,0.5,0.3,0.8,0.4c0.1,0.1,0.4,0.4,0.4,0.7
+		c0.1,0.3,0.1,0.5,0.1,0.8c0,0.3,0,0.7-0.1,0.8c-0.1,0.3-0.3,0.5-0.4,0.7c-0.1,0.1-0.4,0.3-0.8,0.4c-0.3,0.1-0.7,0.1-1.1,0.1
+		C24.2,56.3,22.6,56.3,22.6,56.3z M22.6,55.5h1.6c0.3,0,0.5,0,0.7-0.1c0.1,0,0.4-0.1,0.4-0.3c0.1-0.1,0.3-0.3,0.3-0.4
+		c0-0.1,0.1-0.4,0.1-0.5c0-0.1,0-0.4-0.1-0.5c0-0.1-0.1-0.3-0.3-0.4C25.1,53.1,25,53,24.9,53c-0.1-0.1-0.4-0.1-0.7-0.1h-1.6V55.5z"
+		/>
+	<path class="st2" d="M28.6,56.3V59h-0.9v-6.7h2.6c0.4,0,0.7,0,1.1,0.1c0.3,0.1,0.5,0.3,0.8,0.4c0.1,0.1,0.4,0.4,0.4,0.7
+		c0.1,0.3,0.1,0.5,0.1,0.8c0,0.3,0,0.7-0.1,0.8c-0.1,0.3-0.3,0.5-0.4,0.7c-0.1,0.1-0.4,0.3-0.8,0.4c-0.3,0.1-0.7,0.1-1.1,0.1
+		C30.3,56.3,28.6,56.3,28.6,56.3z M28.6,55.5h1.6c0.3,0,0.5,0,0.7-0.1c0.1,0,0.4-0.1,0.4-0.3c0.1-0.1,0.3-0.3,0.3-0.4
+		c0-0.1,0.1-0.4,0.1-0.5c0-0.1,0-0.4-0.1-0.5c0-0.1-0.1-0.3-0.3-0.4c-0.1-0.1-0.3-0.3-0.4-0.3c-0.1-0.1-0.4-0.1-0.7-0.1h-1.6V55.5z"
+		/>
+	<path class="st2" d="M34.7,59h-0.9v-6.7h0.9V59z"/>
+	<path class="st2" d="M41.1,52.1v4.6c0,0.4-0.1,0.7-0.1,0.9c-0.1,0.3-0.3,0.5-0.5,0.7c-0.3,0.1-0.5,0.3-0.8,0.4
+		c-0.3,0.1-0.7,0.1-0.9,0.1c-0.4,0-0.7,0-0.9-0.1c-0.3-0.1-0.5-0.3-0.8-0.4s-0.4-0.4-0.5-0.7c-0.1-0.1-0.3-0.5-0.3-0.9v-4.6h0.9v4.6
+		c0,0.3,0,0.5,0.1,0.7s0.1,0.4,0.3,0.5c0.1,0.1,0.3,0.3,0.5,0.3c0.1,0,0.4,0.1,0.7,0.1c0.3,0,0.4,0,0.7-0.1c0.1,0,0.4-0.1,0.5-0.3
+		c0.1-0.1,0.3-0.3,0.3-0.5c0-0.1,0-0.4,0-0.7v-4.6H41.1z"/>
+	<path class="st2" d="M43.7,52.1l2.2,5.5l2.2-5.5h1.2v6.7h-0.9v-2.7l0.1-2.8l-2.3,5.5h-0.5l-2.3-5.5l0.1,2.8v2.7h-0.9v-6.7H43.7z"/>
+</g>
+</svg>
diff --git a/src/shared/containers/challenge-listing/FilterPanel.jsx b/src/shared/containers/challenge-listing/FilterPanel.jsx
index 045710dd89..43ce2ff7da 100644
--- a/src/shared/containers/challenge-listing/FilterPanel.jsx
+++ b/src/shared/containers/challenge-listing/FilterPanel.jsx
@@ -99,7 +99,7 @@ export class Container extends React.Component {
       validTypes,
     } = this.props;
 
-    if (validTypes.length && !this.initialDefaultChallengeTypes) {
+    if (!filterState.types.length && validTypes.length && !this.initialDefaultChallengeTypes) {
       setFilterState({
         ..._.clone(filterState),
         types: validTypes.map(item => item.abbreviation),