diff --git a/cohesion.config.js b/cohesion.config.js
index d45608a85..915773b15 100644
--- a/cohesion.config.js
+++ b/cohesion.config.js
@@ -8,9 +8,9 @@ const cohesionConfig = {
   postTypeGql: '',
   homepageGql: '',
   siteUrl: process.env.MARKETING_SITE_BASE_URL,
-  cmsUrl: process.env.NEXT_PUBLIC_WORDPRESS_URL || '',
-  cmsUser: process.env.WP_USER || '',
-  cmsPwd: process.env.WP_PWD || '',
+  cmsUrl: '',
+  cmsUser: '',
+  cmsPwd: '',
   logoUrl: '',
   studyMatchUrl: '',
   voyagerUrl: '/discover',
diff --git a/public/index.html b/public/index.html
index 59c3499cd..2b56cf07b 100755
--- a/public/index.html
+++ b/public/index.html
@@ -20,10 +20,10 @@
     <% } %>
 
     <% /* NOTE: Adding Red Ventures related cohesion/tagular code for the launch of the new marketing website. */ %>
-    <% if (htmlWebpackPlugin.options.cohesionConfig) { %>
+    <% if (htmlWebpackPlugin?.options?.cohesionConfig) { %>
     <script>
-      {`!function(co,h,e,s,i,o,n){var d='documentElement';var a='className';h[d][a]+=' preampjs';
-      n.k=e;co._Cohesion=n;co._Preamp={k:s,start:new Date};co._Fuse={k:i};co._Tagular={k:o};
+      !function(co,h,e,s,i,o,n){console.log('Cohesion script running'); var d='documentElement';var a='className';h[d][a]+=' preampjs';
+      n.k=e;co._Cohesion=n;co._Preamp={k:s,start:new Date};co._Fuse={k:i};co._Tagular={k:o}; co.tagular = o;
       [e,s,i,o].map(function(x){co[x]=co[x]||function(){(co[x].q=co[x].q||[]).push([].slice.call(arguments))}});
       var b=function(){var u=h[d][a];h[d][a]=u.replace(/ ?preampjs/g,'')};
       h.addEventListener('DOMContentLoaded',function(){co.setTimeout(b,3e3);
@@ -34,15 +34,15 @@
       (window,document,'cohesion','preamp','fuse','tagular',{
           tagular: {
               apiHost: 'https://beam.edx.org/v2/t',
-              writeKey: '<%= htmlWebpackPlugin.options.cohesionConfig.tagularWriteKey %>',
-              sourceKey: '<%= htmlWebpackPlugin.options.cohesionConfig.tagularSourceKey %>',
-              cookieDomain: '<%= htmlWebpackPlugin.options.cohesionConfig.tagularCookieDomain %>',
-              domainWhitelist: <%= htmlWebpackPlugin.options.cohesionConfig.tagularDomainWhitelist %>,
+              writeKey: '<%= htmlWebpackPlugin?.options?.cohesionConfig?.tagularWriteKey %>',
+              sourceKey: '<%= htmlWebpackPlugin?.options?.cohesionConfig?.tagularSourceKey %>',
+              cookieDomain: '<%= htmlWebpackPlugin?.options?.cohesionConfig?.tagularCookieDomain %>',
+              domainWhitelist: `<%= htmlWebpackPlugin?.options?.cohesionConfig?.tagularDomainWhitelist %>`,
               apiVersion: 'v2/t',
               multiparty: true,
               taggy: { enabled: true },
           }
-      })`}
+      })
     </script>
     <% } %>
   </head>
diff --git a/src/feedback/AlertMessage.jsx b/src/feedback/AlertMessage.jsx
index 31f585bb2..f9b35735d 100644
--- a/src/feedback/AlertMessage.jsx
+++ b/src/feedback/AlertMessage.jsx
@@ -29,7 +29,7 @@ const AlertMessage = (props) => {
   useEffect(() => {
     const observerCallback = (entries) => {
       entries.forEach(entry => {
-        if (entry.isIntersecting && messageType === 'success' && userMessage.includes('added to basket')) {
+        if (entry.isIntersecting && entry.target?.innerText.includes('added to basket')) {
           const tagularElement = {
             title: PaymentTitle,
             url: entry.target?.baseURI,