diff --git a/src/shared/components/Dashboard/CurrentActivity/Challenges/ChallengeCard/index.jsx b/src/shared/components/Dashboard/CurrentActivity/Challenges/ChallengeCard/index.jsx
index 2293c5b15c..795f3f1ff1 100644
--- a/src/shared/components/Dashboard/CurrentActivity/Challenges/ChallengeCard/index.jsx
+++ b/src/shared/components/Dashboard/CurrentActivity/Challenges/ChallengeCard/index.jsx
@@ -35,11 +35,6 @@ function normalizeSubTrackTagForRendering(subTrack) {
   return _.startCase(_.toLower(x));
 }
 
-function normalizeSubTrack(subTrack) {
-  const type = _.upperCase(subTrack);
-  return type.replace(/ /g, '_');
-}
-
 export default function ChallengeCard({
   challenge,
   selectChallengeDetailsTab,
@@ -57,7 +52,11 @@ export default function ChallengeCard({
     type,
   } = challenge;
 
-  const subTrackId = _.findKey(challengeSubtracksMap, { abbreviation: normalizeSubTrack(type) });
+  let subTrackId = _.findKey(challengeSubtracksMap, { description: type });
+
+  if (!subTrackId) {
+    subTrackId = _.findKey(challengeSubtracksMap, { description: 'Code' });
+  }
 
   const { track } = legacy;
 
@@ -229,7 +228,7 @@ export default function ChallengeCard({
             ) : null
           }
           {
-            submitter && isChallengeOpen ? (
+            submitter && isChallengeOpen && phaseMessage !== STALLED_MSG ? (
               <Button
                 size="sm"
                 theme={{ button: style.button }}
diff --git a/src/shared/containers/SubmissionPage.jsx b/src/shared/containers/SubmissionPage.jsx
index c53b156f73..33396ecf26 100644
--- a/src/shared/containers/SubmissionPage.jsx
+++ b/src/shared/containers/SubmissionPage.jsx
@@ -34,13 +34,9 @@ class SubmissionsPageContainer extends React.Component {
       getCommunitiesList,
       challengeId,
       loadChallengeDetails,
-      challengeName,
     } = this.props;
 
-    if (!challengeName) {
-      loadChallengeDetails(auth, challengeId);
-    }
-
+    loadChallengeDetails(auth, challengeId);
     getCommunitiesList(auth);
   }