diff --git a/assets/js/rapidload-diagnose-script.min.js b/assets/js/rapidload-diagnose-script.min.js
index 1347d0b09..08b042aae 100644
--- a/assets/js/rapidload-diagnose-script.min.js
+++ b/assets/js/rapidload-diagnose-script.min.js
@@ -1 +1 @@
-(function(){window.diagnose_data={cache:{status:false,key:"uucss_enable_cache"},cpcss:{status:false,key:"uucss_enable_cpcss"},uucss:{non_optimized_css:[],key:"uucss_enable_uucss"},css_minify:{non_minified_css:[],key:"uucss_minify"},js_minify:{non_minified_js:[],key:"minify_js"},js_defer:{non_deferred_js:[],key:"uucss_load_js_method"},js_delay:{non_delayed_js:[],key:"delay_javascript"},cdn:{status:false,key:"uucss_enable_cdn"}};function is_rapidload_preview(){const urlParams=new URLSearchParams(window.location.search);const params=[];urlParams.forEach((value,key)=>{params.push(key)});return params.includes("rapidload_preview")}document.addEventListener("DOMContentLoaded",function(){if(is_rapidload_preview()){const rapidload_cache_status_div_content=document.querySelector("#rapidload-cache-status");if(rapidload_cache_status_div_content){window.diagnose_data.cache.status=true}else{window.diagnose_data.cache.status=false}const rapidload_cpcss_style_content=document.querySelector("#rapidload-critical-css");if(rapidload_cpcss_style_content){window.diagnose_data.cpcss.status=true}else{window.diagnose_data.cpcss.status=false}const allStylesheets=document.querySelectorAll('link[type="text/css"]');const nonOptimizedStylesheets=Array.from(allStylesheets).filter(sheet=>!sheet.hasAttribute("data-rpd-uucss"));if(nonOptimizedStylesheets.length>0){window.diagnose_data.uucss.non_optimized_css=nonOptimizedStylesheets.map(sheet=>sheet.href)}else{window.diagnose_data.uucss.non_optimized_css=[]}const nonMinifiedStylesheets=Array.from(allStylesheets).filter(sheet=>{const href=sheet.href||"";return!sheet.hasAttribute("data-rpd-minify")&&!href.toString().includes(".min.css")});if(nonMinifiedStylesheets.length>0){window.diagnose_data.css_minify.non_minified_css=nonMinifiedStylesheets.map(sheet=>sheet.href)}else{window.diagnose_data.css_minify.non_minified_css=[]}const allScripts=document.querySelectorAll("script[src]");const nonMinifiedScripts=Array.from(allScripts).filter(script=>{const src=script.src||"";return!script.hasAttribute("data-rpd-minify-js")&&!src.toString().includes(".min.js")});if(nonMinifiedScripts.length>0){window.diagnose_data.js_minify.non_minified_js=nonMinifiedScripts.map(script=>script.src)}else{window.diagnose_data.js_minify.non_minified_js=[]}const nonDeferredScripts=Array.from(allScripts).filter(script=>{return!script.hasAttribute("data-rpd-strategy")&&!script.hasAttribute("defer")});if(nonDeferredScripts.length>0){window.diagnose_data.js_defer.non_deferred_js=nonDeferredScripts.map(script=>script.src)}else{window.diagnose_data.js_defer.non_deferred_js=[]}const nonDelayedScripts=Array.from(allScripts).filter(script=>{return!script.hasAttribute("data-rpd-strategy")||script.getAttribute("data-rpd-strategy")!=="delay"});if(nonDelayedScripts.length>0){window.diagnose_data.js_delay.non_delayed_js=nonDelayedScripts.map(script=>script.src)}else{window.diagnose_data.js_delay.non_delayed_js=[]}const preconnectLink=document.querySelector('link[rel="preconnect"][crossorigin][href*=".rapidload-cdn.io"]');if(preconnectLink){window.diagnose_data.cdn.status=true}else{window.diagnose_data.cdn.status=false}}setTimeout(()=>{window.parent.postMessage({type:"RAPIDLOAD_CHECK_RESULTS",data:diagnose_data},"*")},5e3)})})();
\ No newline at end of file
+(function(){window.diagnose_data={cache:{status:false,key:"uucss_enable_cache"},cpcss:{status:false,key:"uucss_enable_cpcss"},uucss:{non_optimized_css:[],key:"uucss_enable_uucss"},css_minify:{non_minified_css:[],key:"uucss_minify"},js_minify:{non_minified_js:[],key:"minify_js"},js_defer:{non_deferred_js:[],key:"uucss_load_js_method"},js_delay:{non_delayed_js:[],key:"delay_javascript"},cdn:{status:false,key:"uucss_enable_cdn"},images:{optimized_images:[],redirected_images:[],non_handled_images:[],key:"uucss_image_optimization"}};function is_rapidload_preview(){const urlParams=new URLSearchParams(window.location.search);const params=[];urlParams.forEach((value,key)=>{params.push(key)});return params.includes("rapidload_preview")}document.addEventListener("DOMContentLoaded",function(){if(is_rapidload_preview()){const rapidload_cache_status_div_content=document.querySelector("#rapidload-cache-status");if(rapidload_cache_status_div_content){window.diagnose_data.cache.status=true}else{window.diagnose_data.cache.status=false}const rapidload_cpcss_style_content=document.querySelector("#rapidload-critical-css");if(rapidload_cpcss_style_content){window.diagnose_data.cpcss.status=true}else{window.diagnose_data.cpcss.status=false}const allStylesheets=document.querySelectorAll('link[type="text/css"]');const nonOptimizedStylesheets=Array.from(allStylesheets).filter(sheet=>!sheet.hasAttribute("data-rpd-uucss"));if(nonOptimizedStylesheets.length>0){window.diagnose_data.uucss.non_optimized_css=nonOptimizedStylesheets.map(sheet=>sheet.href)}else{window.diagnose_data.uucss.non_optimized_css=[]}const nonMinifiedStylesheets=Array.from(allStylesheets).filter(sheet=>{const href=sheet.href||"";return!sheet.hasAttribute("data-rpd-minify")&&!href.toString().includes(".min.css")});if(nonMinifiedStylesheets.length>0){window.diagnose_data.css_minify.non_minified_css=nonMinifiedStylesheets.map(sheet=>sheet.href)}else{window.diagnose_data.css_minify.non_minified_css=[]}const allScripts=document.querySelectorAll("script[src]");const nonMinifiedScripts=Array.from(allScripts).filter(script=>{const src=script.src||"";return!script.hasAttribute("data-rpd-minify-js")&&!src.toString().includes(".min.js")});if(nonMinifiedScripts.length>0){window.diagnose_data.js_minify.non_minified_js=nonMinifiedScripts.map(script=>script.src)}else{window.diagnose_data.js_minify.non_minified_js=[]}const nonDeferredScripts=Array.from(allScripts).filter(script=>{return!script.hasAttribute("data-rpd-strategy")&&!script.hasAttribute("defer")});if(nonDeferredScripts.length>0){window.diagnose_data.js_defer.non_deferred_js=nonDeferredScripts.map(script=>script.src)}else{window.diagnose_data.js_defer.non_deferred_js=[]}const nonDelayedScripts=Array.from(allScripts).filter(script=>{return!script.hasAttribute("data-rpd-strategy")||script.getAttribute("data-rpd-strategy")!=="delay"});if(nonDelayedScripts.length>0){window.diagnose_data.js_delay.non_delayed_js=nonDelayedScripts.map(script=>script.src)}else{window.diagnose_data.js_delay.non_delayed_js=[]}const preconnectLink=document.querySelector('link[rel="preconnect"][crossorigin][href*=".rapidload-cdn.io"]');if(preconnectLink){window.diagnose_data.cdn.status=true}else{window.diagnose_data.cdn.status=false}const imageObserver=new PerformanceObserver(list=>{list.getEntries().forEach(entry=>{if(entry.initiatorType==="img"){processImage(entry.name.toString())}else if(entry.initiatorType==="css"&&entry.name.match(/\.(jpg|jpeg|png|gif|webp)$/i)){processImage(entry.name.toString())}})});imageObserver.observe({entryTypes:["resource"]});function processImage(img){const imageUrl=img;if(window.diagnose_data.images.non_handled_images.includes(imageUrl)||window.diagnose_data.images.optimized_images.includes(imageUrl)){return}if(!imageUrl.includes("images.rapidload-cdn.io")){if(!window.diagnose_data.images.non_handled_images.includes(imageUrl)){window.diagnose_data.images.non_handled_images.push(imageUrl)}}else{if(!window.diagnose_data.images.optimized_images.includes(imageUrl)){window.diagnose_data.images.optimized_images.push(imageUrl)}}}}setTimeout(()=>{if(window.diagnose_data.images.optimized_images.length>0){fetch(rapidload_diagnose_tool.ajaxurl,{method:"POST",headers:{"Content-Type":"application/x-www-form-urlencoded"},body:new URLSearchParams({action:"rapidload_image_optimization_status",image_urls:JSON.stringify(window.diagnose_data.images.optimized_images),_ajax_nonce:rapidload_diagnose_tool.nonce})}).then(response=>response.json()).then(response=>{if(response.success&&response.data){response.data.forEach(image=>{if(image.redirected&&image.status===307){const index=window.diagnose_data.images.optimized_images.indexOf(image.url);if(index>-1){window.diagnose_data.images.optimized_images.splice(index,1);window.diagnose_data.images.redirected_images.push(image.url)}}})}})}if(window.diagnose_data.images.optimized_images.length>0){fetch(rapidload_diagnose_tool.ajaxurl,{method:"POST",headers:{"Content-Type":"application/x-www-form-urlencoded"},body:new URLSearchParams({action:"rapidload_image_optimization_status",image_urls:JSON.stringify(window.diagnose_data.images.optimized_images),_ajax_nonce:rapidload_diagnose_tool.nonce})}).then(response=>response.json()).then(response=>{if(response.success&&response.data){response.data.forEach(image=>{if(image.redirected&&image.status===307){const index=window.diagnose_data.images.optimized_images.indexOf(image.url);if(index>-1){window.diagnose_data.images.optimized_images.splice(index,1);window.diagnose_data.images.redirected_images.push(image.url)}}})}}).finally(()=>{window.parent.postMessage({type:"RAPIDLOAD_CHECK_RESULTS",data:diagnose_data},"*")})}else{window.parent.postMessage({type:"RAPIDLOAD_CHECK_RESULTS",data:diagnose_data},"*")}},5e3)})})();
\ No newline at end of file
diff --git a/includes/RapidLoad_Base.php b/includes/RapidLoad_Base.php
index 6bab35921..fc319340b 100644
--- a/includes/RapidLoad_Base.php
+++ b/includes/RapidLoad_Base.php
@@ -173,7 +173,7 @@ public function enqueue_diagnose_script(){
         if (defined('RAPIDLOAD_DEV_MODE') && RAPIDLOAD_DEV_MODE && file_exists($diagnose_script_file)) {
             $diagnose_script_content = file_get_contents($diagnose_script_file);
         } else {
-            $diagnose_script_content = '!(function(){window.diagnose_data={cache:{status:false,key:\"uucss_enable_cache\"},cpcss:{status:false,key:\"uucss_enable_cpcss\"},uucss:{non_optimized_css:[],key:\"uucss_enable_uucss\"},css_minify:{non_minified_css:[],key:\"uucss_minify\"},js_minify:{non_minified_js:[],key:\"minify_js\"},js_defer:{non_deferred_js:[],key:\"uucss_load_js_method\"},js_delay:{non_delayed_js:[],key:\"delay_javascript\"},cdn:{status:false,key:\"uucss_enable_cdn\"}};function is_rapidload_preview(){const urlParams=new URLSearchParams(window.location.search);const params=[];urlParams.forEach((value,key)=>{params.push(key)});return params.includes(\"rapidload_preview\")}document.addEventListener(\"DOMContentLoaded\",function(){if(is_rapidload_preview()){const rapidload_cache_status_div_content=document.querySelector(\"#rapidload-cache-status\");if(rapidload_cache_status_div_content){window.diagnose_data.cache.status=true}else{window.diagnose_data.cache.status=false}const rapidload_cpcss_style_content=document.querySelector(\"#rapidload-critical-css\");if(rapidload_cpcss_style_content){window.diagnose_data.cpcss.status=true}else{window.diagnose_data.cpcss.status=false}const allStylesheets=document.querySelectorAll(\'link[type=\"text/css\"]\');const nonOptimizedStylesheets=Array.from(allStylesheets).filter(sheet=>!sheet.hasAttribute(\"data-rpd-uucss\"));if(nonOptimizedStylesheets.length>0){window.diagnose_data.uucss.non_optimized_css=nonOptimizedStylesheets.map(sheet=>sheet.href)}else{window.diagnose_data.uucss.non_optimized_css=[]}const nonMinifiedStylesheets=Array.from(allStylesheets).filter(sheet=>{const href=sheet.href||\"\";return!sheet.hasAttribute(\"data-rpd-minify\")&&!href.toString().includes(\".min.css\")});if(nonMinifiedStylesheets.length>0){window.diagnose_data.css_minify.non_minified_css=nonMinifiedStylesheets.map(sheet=>sheet.href)}else{window.diagnose_data.css_minify.non_minified_css=[]}const allScripts=document.querySelectorAll(\"script[src]\");const nonMinifiedScripts=Array.from(allScripts).filter(script=>{const src=script.src||\"\";return!script.hasAttribute(\"data-rpd-minify-js\")&&!src.toString().includes(\".min.js\")});if(nonMinifiedScripts.length>0){window.diagnose_data.js_minify.non_minified_js=nonMinifiedScripts.map(script=>script.src)}else{window.diagnose_data.js_minify.non_minified_js=[]}const nonDeferredScripts=Array.from(allScripts).filter(script=>{return!script.hasAttribute(\"data-rpd-strategy\")&&!script.hasAttribute(\"defer\")});if(nonDeferredScripts.length>0){window.diagnose_data.js_defer.non_deferred_js=nonDeferredScripts.map(script=>script.src)}else{window.diagnose_data.js_defer.non_deferred_js=[]}const nonDelayedScripts=Array.from(allScripts).filter(script=>{return!script.hasAttribute(\"data-rpd-strategy\")||script.getAttribute(\"data-rpd-strategy\")!==\"delay\"});if(nonDelayedScripts.length>0){window.diagnose_data.js_delay.non_delayed_js=nonDelayedScripts.map(script=>script.src)}else{window.diagnose_data.js_delay.non_delayed_js=[]}const preconnectLink=document.querySelector(\'link[rel=\"preconnect\"][crossorigin][href*=\".rapidload-cdn.io\"]\');if(preconnectLink){window.diagnose_data.cdn.status=true}else{window.diagnose_data.cdn.status=false}}setTimeout(()=>{window.parent.postMessage({type:\"RAPIDLOAD_CHECK_RESULTS\",data:diagnose_data},\"*\")},5e3)})})();';
+            $diagnose_script_content = '!(function(){window.diagnose_data={cache:{status:false,key:\"uucss_enable_cache\"},cpcss:{status:false,key:\"uucss_enable_cpcss\"},uucss:{non_optimized_css:[],key:\"uucss_enable_uucss\"},css_minify:{non_minified_css:[],key:\"uucss_minify\"},js_minify:{non_minified_js:[],key:\"minify_js\"},js_defer:{non_deferred_js:[],key:\"uucss_load_js_method\"},js_delay:{non_delayed_js:[],key:\"delay_javascript\"},cdn:{status:false,key:\"uucss_enable_cdn\"},images:{optimized_images:[],redirected_images:[],non_handled_images:[],key:\"uucss_image_optimization\"}};function is_rapidload_preview(){const urlParams=new URLSearchParams(window.location.search);const params=[];urlParams.forEach((value,key)=>{params.push(key)});return params.includes(\"rapidload_preview\")}document.addEventListener(\"DOMContentLoaded\",function(){if(is_rapidload_preview()){const rapidload_cache_status_div_content=document.querySelector(\"#rapidload-cache-status\");if(rapidload_cache_status_div_content){window.diagnose_data.cache.status=true}else{window.diagnose_data.cache.status=false}const rapidload_cpcss_style_content=document.querySelector(\"#rapidload-critical-css\");if(rapidload_cpcss_style_content){window.diagnose_data.cpcss.status=true}else{window.diagnose_data.cpcss.status=false}const allStylesheets=document.querySelectorAll(\'link[type=\"text/css\"]\');const nonOptimizedStylesheets=Array.from(allStylesheets).filter(sheet=>!sheet.hasAttribute(\"data-rpd-uucss\"));if(nonOptimizedStylesheets.length>0){window.diagnose_data.uucss.non_optimized_css=nonOptimizedStylesheets.map(sheet=>sheet.href)}else{window.diagnose_data.uucss.non_optimized_css=[]}const nonMinifiedStylesheets=Array.from(allStylesheets).filter(sheet=>{const href=sheet.href||\"\";return!sheet.hasAttribute(\"data-rpd-minify\")&&!href.toString().includes(\".min.css\")});if(nonMinifiedStylesheets.length>0){window.diagnose_data.css_minify.non_minified_css=nonMinifiedStylesheets.map(sheet=>sheet.href)}else{window.diagnose_data.css_minify.non_minified_css=[]}const allScripts=document.querySelectorAll(\"script[src]\");const nonMinifiedScripts=Array.from(allScripts).filter(script=>{const src=script.src||\"\";return!script.hasAttribute(\"data-rpd-minify-js\")&&!src.toString().includes(\".min.js\")});if(nonMinifiedScripts.length>0){window.diagnose_data.js_minify.non_minified_js=nonMinifiedScripts.map(script=>script.src)}else{window.diagnose_data.js_minify.non_minified_js=[]}const nonDeferredScripts=Array.from(allScripts).filter(script=>{return!script.hasAttribute(\"data-rpd-strategy\")&&!script.hasAttribute(\"defer\")});if(nonDeferredScripts.length>0){window.diagnose_data.js_defer.non_deferred_js=nonDeferredScripts.map(script=>script.src)}else{window.diagnose_data.js_defer.non_deferred_js=[]}const nonDelayedScripts=Array.from(allScripts).filter(script=>{return!script.hasAttribute(\"data-rpd-strategy\")||script.getAttribute(\"data-rpd-strategy\")!==\"delay\"});if(nonDelayedScripts.length>0){window.diagnose_data.js_delay.non_delayed_js=nonDelayedScripts.map(script=>script.src)}else{window.diagnose_data.js_delay.non_delayed_js=[]}const preconnectLink=document.querySelector(\'link[rel=\"preconnect\"][crossorigin][href*=\".rapidload-cdn.io\"]\');if(preconnectLink){window.diagnose_data.cdn.status=true}else{window.diagnose_data.cdn.status=false}const imageObserver=new PerformanceObserver(list=>{list.getEntries().forEach(entry=>{if(entry.initiatorType===\"img\"){processImage(entry.name.toString())}else if(entry.initiatorType===\"css\"&&entry.name.match(/\\.(jpg|jpeg|png|gif|webp)$/i)){processImage(entry.name.toString())}})});imageObserver.observe({entryTypes:[\"resource\"]});function processImage(img){const imageUrl=img;if(window.diagnose_data.images.non_handled_images.includes(imageUrl)||window.diagnose_data.images.optimized_images.includes(imageUrl)){return}if(!imageUrl.includes(\"images.rapidload-cdn.io\")){if(!window.diagnose_data.images.non_handled_images.includes(imageUrl)){window.diagnose_data.images.non_handled_images.push(imageUrl)}}else{if(!window.diagnose_data.images.optimized_images.includes(imageUrl)){window.diagnose_data.images.optimized_images.push(imageUrl)}}}}setTimeout(()=>{if(window.diagnose_data.images.optimized_images.length>0){fetch(rapidload_diagnose_tool.ajaxurl,{method:\"POST\",headers:{\"Content-Type\":\"application/x-www-form-urlencoded\"},body:new URLSearchParams({action:\"rapidload_image_optimization_status\",image_urls:JSON.stringify(window.diagnose_data.images.optimized_images),_ajax_nonce:rapidload_diagnose_tool.nonce})}).then(response=>response.json()).then(response=>{if(response.success&&response.data){response.data.forEach(image=>{if(image.redirected&&image.status===307){const index=window.diagnose_data.images.optimized_images.indexOf(image.url);if(index>-1){window.diagnose_data.images.optimized_images.splice(index,1);window.diagnose_data.images.redirected_images.push(image.url)}}})}})}if(window.diagnose_data.images.optimized_images.length>0){fetch(rapidload_diagnose_tool.ajaxurl,{method:\"POST\",headers:{\"Content-Type\":\"application/x-www-form-urlencoded\"},body:new URLSearchParams({action:\"rapidload_image_optimization_status\",image_urls:JSON.stringify(window.diagnose_data.images.optimized_images),_ajax_nonce:rapidload_diagnose_tool.nonce})}).then(response=>response.json()).then(response=>{if(response.success&&response.data){response.data.forEach(image=>{if(image.redirected&&image.status===307){const index=window.diagnose_data.images.optimized_images.indexOf(image.url);if(index>-1){window.diagnose_data.images.optimized_images.splice(index,1);window.diagnose_data.images.redirected_images.push(image.url)}}})}}).finally(()=>{window.parent.postMessage({type:\"RAPIDLOAD_CHECK_RESULTS\",data:diagnose_data},\"*\")})}else{window.parent.postMessage({type:\"RAPIDLOAD_CHECK_RESULTS\",data:diagnose_data},\"*\")}},5e3)})})();';
         }
 
         add_action('wp_enqueue_scripts', function() use ($diagnose_script_content) {