diff --git a/.circleci/config.yml b/.circleci/config.yml
index d723a4d47b..c94aa0f975 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -289,7 +289,7 @@ workflows:
           filters:
             branches:
               only:
-                - free
+                - gigs-housekeep
       # This is beta env for production soft releases
       - "build-prod-beta":
           context : org-global
diff --git a/src/shared/components/Gigs/GigApply/index.jsx b/src/shared/components/Gigs/GigApply/index.jsx
index fee683a3dd..6a7eee3f15 100644
--- a/src/shared/components/Gigs/GigApply/index.jsx
+++ b/src/shared/components/Gigs/GigApply/index.jsx
@@ -48,7 +48,11 @@ export default function GigApply(props) {
                   <h2>{application.error ? 'OOPS!' : 'APPLICATION SUBMITTED'}</h2>
                   {
                     application.error ? (
-                      <p>Looks like there is a problem on our end. Please try again.<br />If this persists please contact <a href="mailto:support@topcoder.com">support@topcoder.com</a>.</p>
+                      <React.Fragment>
+                        <p styleName="error-text">{application.errorObj.message || JSON.stringify(application.errorObj)}</p>
+                        <p>Looks like there is a problem on our end. Please try again.<br />If this persists please contact <a href="mailto:support@topcoder.com">support@topcoder.com</a>.</p>
+                        <p>Please send us an email at <a href="mailto:gigwork@topcoder.com">gigwork@topcoder.com</a> with the subject ‘Gig Error’<br />and paste the URL for the gig you are attempting to apply for so that we know of your interest.</p>
+                      </React.Fragment>
                     ) : (
                       <p>We will contact you via email if it seems like a fit!</p>
                     )
@@ -56,15 +60,18 @@ export default function GigApply(props) {
                   <div styleName="cta-buttons">
                     {
                       application.error ? (
-                        <a
-                          href="#"
-                          styleName="primaryBtn"
-                          onClick={(e) => {
-                            e.preventDefault();
-                            window.location.reload();
-                          }}
-                        >APPLY AGAIN
-                        </a>
+                        <React.Fragment>
+                          <a
+                            href="#"
+                            styleName="primaryBtn"
+                            onClick={(e) => {
+                              e.preventDefault();
+                              window.location.reload();
+                            }}
+                          >APPLY AGAIN
+                          </a>
+                          <Link to={`${config.GIGS_PAGES_PATH}`}>VIEW OTHER GIGS</Link>
+                        </React.Fragment>
                       ) : (
                         <Link to={`${config.GIGS_PAGES_PATH}`} styleName="primaryBtn">GO TO GIG LIST</Link>
                       )
diff --git a/src/shared/components/Gigs/GigApply/style.scss b/src/shared/components/Gigs/GigApply/style.scss
index 6a468ed64b..b14c0dbdd5 100644
--- a/src/shared/components/Gigs/GigApply/style.scss
+++ b/src/shared/components/Gigs/GigApply/style.scss
@@ -241,11 +241,16 @@
         text-decoration: none;
       }
     }
+
+    .error-text {
+      color: #ef476f;
+    }
   }
   /* stylelint-disable */
   .cta-buttons {
     display: flex;
     justify-content: center;
+    align-items: flex-start;
     margin-top: 47px;
 
     @include xs-to-sm {
@@ -271,6 +276,10 @@
       @include xs-to-sm {
         text-align: center;
       }
+
+      &:last-child {
+        margin-left: 20px;
+      }
     }
   }
   /* stylelint-enable */
diff --git a/src/shared/containers/Gigs/RecruitCRMJobs.jsx b/src/shared/containers/Gigs/RecruitCRMJobs.jsx
index 9bcf00ff0d..eb649611ad 100644
--- a/src/shared/containers/Gigs/RecruitCRMJobs.jsx
+++ b/src/shared/containers/Gigs/RecruitCRMJobs.jsx
@@ -21,7 +21,9 @@ const sortByOptions = [
   { label: 'Latest Updated Descending', selected: false },
 ];
 // Locations
-let locations = [];
+let locations = [{
+  label: 'All', selected: true,
+}];
 
 class RecruitCRMJobsContainer extends React.Component {
   constructor(props) {
@@ -123,12 +125,15 @@ class RecruitCRMJobsContainer extends React.Component {
     jobsToDisplay = _.filter(jobs, (job) => {
       const country = job.country === 'Anywhere' || job.country === 'Any' ? 'All' : job.country;
       // build dropdown
-      const found = _.find(locations, { label: country });
-      if (!found) {
+      const found = _.findIndex(locations, { label: country });
+      if (found === -1) {
         locations.push({
           label: country, selected: location.toLowerCase() === country.toLowerCase(),
         });
+      } else {
+        locations[found].selected = location.toLowerCase() === country.toLowerCase();
       }
+      locations[0].selected = location === 'All';
       // filter
       if (location === 'Anywhere' || location === 'Any' || location === 'All') return true;
       return location.toLowerCase() === job.country.toLowerCase();