diff --git a/public/index.html b/public/index.html
index 5742e1cf6..0b577a76d 100755
--- a/public/index.html
+++ b/public/index.html
@@ -21,17 +21,22 @@
 
     <% /* TEMP: testing cohesionConfig access */ %>
     <script>
-      if (htmlWebpackPlugin && htmlWebpackPlugin.options && htmlWebpackPlugin.options.cohesionConfig) {
-        console.log('htmlWebpackPlugin attribute exists', htmlWebpackPlugin.options.cohesionConfig.tagularDomainWhitelist);
-        window.cohesionConfig = htmlWebpackPlugin.options.cohesionConfig;
-      } else {
-        console.log('htmlWebpackPlugin attribute does not exists');
+      try {
+        if (htmlWebpackPlugin && htmlWebpackPlugin.options && htmlWebpackPlugin.options.cohesionConfig) {
+          console.log('htmlWebpackPlugin attribute exists', htmlWebpackPlugin.options.cohesionConfig.tagularDomainWhitelist);
+          window.cohesionConfig = htmlWebpackPlugin.options.cohesionConfig;
+        } else {
+          console.log('htmlWebpackPlugin attribute does not exists');
+        }
+      } catch (e) {
+        console.log('Error with htmlWebpackPlugin', e)
       }
+
     </script>
 
     <% /* NOTE: Adding Red Ventures related cohesion/tagular code for the launch of the new marketing website. */ %>
     <script>
-      {`!function(co,h,e,s,i,o,n){var d='documentElement';var a='className';h[d][a]+=' preampjs';
+      !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};
       [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,'')};
@@ -43,15 +48,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>
   <body>
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,
