diff --git a/src/shared/components/challenge-detail/Header/ChallengeTags.jsx b/src/shared/components/challenge-detail/Header/ChallengeTags.jsx
index 58806173b7..0dbdc339c1 100644
--- a/src/shared/components/challenge-detail/Header/ChallengeTags.jsx
+++ b/src/shared/components/challenge-detail/Header/ChallengeTags.jsx
@@ -65,8 +65,8 @@ export default function ChallengeTags(props) {
 
 
   const filteredChallenge = _.find(openForRegistrationChallenges, { id: challengeId });
-  const matchSkills = filteredChallenge ? filteredChallenge.match_skills : [];
-  const matchScore = filteredChallenge ? filteredChallenge.jaccard_index : 0;
+  const matchSkills = filteredChallenge ? filteredChallenge.match_skills || [] : [];
+  const matchScore = filteredChallenge ? filteredChallenge.jaccard_index || [] : 0;
 
   const tags = technPlatforms.filter(tag => !matchSkills.includes(tag));
 
@@ -97,7 +97,7 @@ export default function ChallengeTags(props) {
         ))
       }
       {
-        matchScore && (
+        matchScore > 0 && (
           <span styleName="matchScoreWrap">
             <MatchScore score={calculateScore(matchScore)} />
           </span>
diff --git a/src/shared/components/challenge-listing/style.scss b/src/shared/components/challenge-listing/style.scss
index 8efc42d500..741ab8bfb0 100644
--- a/src/shared/components/challenge-listing/style.scss
+++ b/src/shared/components/challenge-listing/style.scss
@@ -118,6 +118,7 @@ $challenge-radius-4: $corner-radius * 2;
   display: inline-block;
   border-radius: 3px;
   padding: 5px 5px 10px 5px;
+  max-width: 400px;
 }
 
 .additionalTagWrapper::after {