diff --git a/assets/js/gdpr-public.js b/assets/js/gdpr-public.js
index 05f3b84e..a45c7f5c 100644
--- a/assets/js/gdpr-public.js
+++ b/assets/js/gdpr-public.js
@@ -1 +1 @@
-!function(e){"use strict";var r=location.search,n=location.protocol+"//"+location.host+location.pathname;function t(r,n,t,o){o=void 0!==o,t=void 0!==t?t:[{title:GDPR.i18n.ok,buttonClass:"gdpr-ok",callback:"closeNotification"}],e(".gdpr-general-confirmation .gdpr-box-title h3").html(r),e(".gdpr-general-confirmation .gdpr-content p").html(n),e(".gdpr-general-confirmation .gdpr-close").show(),o&&e(".gdpr-general-confirmation .gdpr-close").hide();var d="";t.forEach(function(e){d+='<button class="'+e.buttonClass+'" data-callback="'+e.callback+'">'+e.title+"</button>"}),e(".gdpr-general-confirmation footer").html(d),e(".gdpr-overlay").fadeIn(400,function(){e(".gdpr.gdpr-general-confirmation .gdpr-wrapper").css({display:"flex"}).hide().fadeIn(),e("body").addClass("gdpr-noscroll")})}window.has_consent=function(e){if(Cookies.get("gdpr[consent_types]")&&JSON.parse(Cookies.get("gdpr[consent_types]")).indexOf(e)>-1)return!0;return!1},window.is_allowed_cookie=function(e){if(Cookies.get("gdpr[allowed_cookies]")&&JSON.parse(Cookies.get("gdpr[allowed_cookies]")).indexOf(e)>-1)return!0;return!1},e(function(){var o={closeNotification:function(){e(".gdpr-overlay").fadeOut(),e("body").removeClass("gdpr-noscroll"),e(".gdpr.gdpr-general-confirmation .gdpr-wrapper").fadeOut()},addToDeletionConfirmed:function(){e("form.gdpr-add-to-deletion-requests").addClass("confirmed"),e('form.gdpr-add-to-deletion-requests.confirmed input[type="submit"]').click(),o.closeNotification()},policyDisagreeOk:function(){e(".gdpr.gdpr-general-confirmation .gdpr-wrapper header .gdpr-box-title h3").html(GDPR.i18n.aborting),e(".gdpr.gdpr-general-confirmation .gdpr-wrapper .gdpr-content p").html(GDPR.i18n.logging_out),e(".gdpr.gdpr-general-confirmation .gdpr-wrapper footer button").hide(),window.location.href=GDPR.logouturl},policyDisagreeCancel:function(){e(".gdpr.gdpr-general-confirmation .gdpr-wrapper").fadeOut(),e(".gdpr.gdpr-reconsent .gdpr-wrapper").fadeIn()}};-1!==r.indexOf("notify=1")&&(window.history.replaceState({},document.title,n),e("body").addClass("gdpr-notification")),e(document).on("click",".gdpr.gdpr-general-confirmation button",function(r){var n=e(this).data("callback");o[n]()}),e(document).on("submit",".gdpr-privacy-preferences-frm",function(r){r.preventDefault();e(this);var n=e(this).serialize();e.post(GDPR.ajaxurl,n,function(r){r.success?(Cookies.set("gdpr[privacy_bar]",1,{expires:365}),GDPR.refresh?window.location.reload():(e(".gdpr-overlay").fadeOut(),e("body").removeClass("gdpr-noscroll"),e(".gdpr.gdpr-privacy-preferences .gdpr-wrapper").fadeOut(),e(".gdpr-privacy-bar").fadeOut())):t(r.data.title,r.data.content)})}),e(document).on("submit",".gdpr-request-form",function(r){if(r.preventDefault(),e(this).hasClass("confirmed")){var n=e(this).serialize();e.post(GDPR.ajaxurl,n,function(e){t(e.data.title,e.data.content)})}}),e(document).on("change",".gdpr-cookie-category",function(){var r=e(this).data("category"),n=e(this).prop("checked");e('[data-category="'+r+'"]').prop("checked",n)}),Cookies.get("gdpr[privacy_bar]")||0==e(".gdpr-reconsent-bar, .gdpr-reconsent").length&&e(".gdpr.gdpr-privacy-bar").delay(1e3).slideDown(600),e(".gdpr-reconsent-bar").length>0&&e(".gdpr.gdpr-reconsent-bar").delay(1e3).slideDown(600),e(".gdpr-reconsent").length>0&&e(".gdpr-overlay").fadeIn(400,function(){e(".gdpr.gdpr-reconsent .gdpr-wrapper").fadeIn(),e("body").addClass("gdpr-noscroll").delay(1e3)}),e(document).on("click",".gdpr.gdpr-privacy-bar .gdpr-agreement",function(){e(".gdpr-privacy-preferences-frm").submit()}),e(document).on("click",".gdpr.gdpr-reconsent-bar .gdpr-agreement",function(){var r=[];e('.gdpr-policy-list input[type="hidden"]').each(function(){r.push(e(this).val())}),e.post(GDPR.ajaxurl,{action:"agree_with_new_policies",nonce:e(this).data("nonce"),consents:r},function(r){r.success?GDPR.refresh?window.location.reload():(e(".gdpr-reconsent-bar").slideUp(600),Cookies.get("gdpr[privacy_bar]")||e(".gdpr.gdpr-privacy-bar").delay(1e3).slideDown(600)):t(r.data.title,r.data.content)})}),e(document).on("submit",".gdpr-reconsent-frm",function(r){r.preventDefault();var n=[],o=e(this).find("#agree-with-new-policies-nonce").val();e(this).find('[name="gdpr-updated-policy"]').each(function(){n.push(e(this).val())}),e.post(GDPR.ajaxurl,{action:"agree_with_new_policies",nonce:o,consents:n},function(r){r.success?GDPR.refresh?window.location.reload():(e(".gdpr-overlay").fadeOut(),e("body").removeClass("gdpr-noscroll"),e(".gdpr.gdpr-reconsent .gdpr-wrapper").fadeOut(),Cookies.get("gdpr[privacy_bar]")||e(".gdpr.gdpr-privacy-bar").delay(1e3).slideDown(600)):t(r.data.title,r.data.content)})}),e(document).on("click",".gdpr-preferences",function(r){r.preventDefault();e(this).data("type");e(".gdpr-overlay").fadeIn(400,function(){e(".gdpr.gdpr-privacy-preferences .gdpr-wrapper").fadeIn(),e("body").addClass("gdpr-noscroll")})}),e(document).on("click",".gdpr.gdpr-privacy-preferences .gdpr-close",function(){e(".gdpr-reconsent .gdpr-wrapper").is(":visible")||(e(".gdpr-overlay").fadeOut(),e("body").removeClass("gdpr-noscroll")),e(".gdpr.gdpr-privacy-preferences .gdpr-wrapper").fadeOut()}),e(document).on("click",".gdpr.gdpr-privacy-preferences .gdpr-tabs button, .gdpr.gdpr-reconsent .gdpr-tabs button",function(){var r="."+e(this).data("target");e(".gdpr.gdpr-privacy-preferences .gdpr-tab-content > div, .gdpr.gdpr-reconsent .gdpr-tab-content > div").removeClass("gdpr-active"),e(".gdpr.gdpr-privacy-preferences .gdpr-tab-content "+r+", .gdpr.gdpr-reconsent .gdpr-tab-content "+r).addClass("gdpr-active"),e(".gdpr.gdpr-privacy-preferences .gdpr-tabs, .gdpr.gdpr-reconsent .gdpr-tabs").hasClass("gdpr-mobile-expanded")&&(e(".gdpr.gdpr-privacy-preferences .gdpr-mobile-menu button, .gdpr.gdpr-reconsent .gdpr-mobile-menu button").removeClass("gdpr-active"),e(".gdpr.gdpr-privacy-preferences .gdpr-tabs, .gdpr.gdpr-reconsent .gdpr-tabs").toggle()),e(".gdpr.gdpr-privacy-preferences .gdpr-tabs button, .gdpr.gdpr-reconsent .gdpr-tabs button").removeClass("gdpr-active"),e(".gdpr-subtabs li button").removeClass("gdpr-active"),e(this).hasClass("gdpr-tab-button")?(e(this).addClass("gdpr-active"),e(this).hasClass("gdpr-cookie-settings")&&e(".gdpr-subtabs").find("li button").first().addClass("gdpr-active")):(e(".gdpr-cookie-settings").addClass("gdpr-active"),e(this).addClass("gdpr-active"))}),e(document).on("click",".gdpr.gdpr-privacy-preferences .gdpr-mobile-menu button, .gdpr.gdpr-reconsent .gdpr-mobile-menu button",function(r){e(this).toggleClass("gdpr-active"),e(".gdpr.gdpr-privacy-preferences .gdpr-tabs, .gdpr.gdpr-reconsent .gdpr-tabs").toggle().addClass("gdpr-mobile-expanded")}),e(window).resize(function(){e(window).width()>640&&e(".gdpr.gdpr-privacy-preferences .gdpr-tabs, .gdpr.gdpr-reconsent .gdpr-tabs").hasClass("gdpr-mobile-expanded")&&(e(".gdpr.gdpr-privacy-preferences .gdpr-mobile-menu button, .gdpr.gdpr-reconsent .gdpr-mobile-menu button").removeClass("gdpr-active"),e(".gdpr.gdpr-privacy-preferences .gdpr-tabs, .gdpr.gdpr-reconsent .gdpr-tabs").removeClass("gdpr-mobile-expanded").removeAttr("style"))}),e("form.gdpr-add-to-deletion-requests").on("submit",function(r){if(!e(this).hasClass("confirmed")){r.preventDefault();var n=[{title:GDPR.i18n.ok,buttonClass:"gdpr-ok",callback:"addToDeletionConfirmed"},{title:GDPR.i18n.cancel,buttonClass:"gdpr-cancel",callback:"closeNotification"}];t(GDPR.i18n.close_account,GDPR.i18n.close_account_warning,n)}}),e("body").hasClass("gdpr-notification")&&e(".gdpr-overlay").fadeIn(400,function(){e(".gdpr.gdpr-general-confirmation .gdpr-wrapper").css({display:"flex"}).hide().fadeIn(),e("body").addClass("gdpr-noscroll")}),e(document).on("click",".gdpr-disagree a",function(r){e(".gdpr.gdpr-reconsent .gdpr-wrapper").fadeOut();var n=[{title:GDPR.i18n.ok,buttonClass:"gdpr-ok",callback:"policyDisagreeOk"},{title:GDPR.i18n.cancel,buttonClass:"gdpr-cancel",callback:"policyDisagreeCancel"}];t(GDPR.i18n.are_you_sure,GDPR.i18n.policy_disagree,n,!0)})})}(jQuery),function(e){var r=!1;if("function"==typeof define&&define.amd&&(define(e),r=!0),"object"==typeof exports&&(module.exports=e(),r=!0),!r){var n=window.Cookies,t=window.Cookies=e();t.noConflict=function(){return window.Cookies=n,t}}}(function(){function e(){for(var e=0,r={};e<arguments.length;e++){var n=arguments[e];for(var t in n)r[t]=n[t]}return r}return function r(n){function t(r,o,d){var a;if("undefined"!=typeof document){if(arguments.length>1){if("number"==typeof(d=e({path:"/"},t.defaults,d)).expires){var p=new Date;p.setMilliseconds(p.getMilliseconds()+864e5*d.expires),d.expires=p}d.expires=d.expires?d.expires.toUTCString():"";try{a=JSON.stringify(o),/^[\{\[]/.test(a)&&(o=a)}catch(e){}o=n.write?n.write(o,r):encodeURIComponent(String(o)).replace(/%(23|24|26|2B|3A|3C|3E|3D|2F|3F|40|5B|5D|5E|60|7B|7D|7C)/g,decodeURIComponent),r=(r=(r=encodeURIComponent(String(r))).replace(/%(23|24|26|2B|5E|60|7C)/g,decodeURIComponent)).replace(/[\(\)]/g,escape);var i="";for(var c in d)d[c]&&(i+="; "+c,!0!==d[c]&&(i+="="+d[c]));return document.cookie=r+"="+o+i}r||(a={});for(var s=document.cookie?document.cookie.split("; "):[],g=/(%[0-9A-Z]{2})+/g,l=0;l<s.length;l++){var f=s[l].split("="),u=f.slice(1).join("=");this.json||'"'!==u.charAt(0)||(u=u.slice(1,-1));try{var b=f[0].replace(g,decodeURIComponent);if(u=n.read?n.read(u,b):n(u,b)||u.replace(g,decodeURIComponent),this.json)try{u=JSON.parse(u)}catch(e){}if(r===b){a=u;break}r||(a[b]=u)}catch(e){}}return a}}return t.set=t,t.get=function(e){return t.call(t,e)},t.getJSON=function(){return t.apply({json:!0},[].slice.call(arguments))},t.defaults={},t.remove=function(r,n){t(r,"",e(n,{expires:-1}))},t.withConverter=r,t}(function(){})});
+!function(e){"use strict";var r=location.search,o=location.protocol+"//"+location.host+location.pathname;function n(r,o,n,t){t=void 0!==t,n=void 0!==n?n:[{title:GDPR.i18n.ok,buttonClass:"gdpr-ok",callback:"closeNotification"}];var d=e(window).scrollTop();e(".gdpr-general-confirmation .gdpr-box-title h3").html(r),e(".gdpr-general-confirmation .gdpr-content p").html(o),e(".gdpr-general-confirmation .gdpr-close").show(),t&&e(".gdpr-general-confirmation .gdpr-close").hide();var a="";n.forEach(function(e){a+='<button class="'+e.buttonClass+'" data-callback="'+e.callback+'">'+e.title+"</button>"}),e(".gdpr-general-confirmation footer").html(a),e(".gdpr-overlay").fadeIn(400,function(){e(".gdpr.gdpr-general-confirmation .gdpr-wrapper").css({display:"flex"}).hide().fadeIn(),e("body").addClass("gdpr-noscroll").css("top",-d)})}window.has_consent=function(e){if(Cookies.get("gdpr[consent_types]")&&JSON.parse(Cookies.get("gdpr[consent_types]")).indexOf(e)>-1)return!0;return!1},window.is_allowed_cookie=function(e){if(Cookies.get("gdpr[allowed_cookies]")&&JSON.parse(Cookies.get("gdpr[allowed_cookies]")).indexOf(e)>-1)return!0;return!1},e(function(){var t={closeNotification:function(){var r=e("body").css("top");e(".gdpr-overlay").fadeOut(),e("body").removeClass("gdpr-noscroll"),e(window).scrollTop(Math.abs(parseInt(r,10))),e(".gdpr.gdpr-general-confirmation .gdpr-wrapper").fadeOut()},addToDeletionConfirmed:function(){e("form.gdpr-add-to-deletion-requests").addClass("confirmed"),e('form.gdpr-add-to-deletion-requests.confirmed input[type="submit"]').click(),t.closeNotification()},policyDisagreeOk:function(){e(".gdpr.gdpr-general-confirmation .gdpr-wrapper header .gdpr-box-title h3").html(GDPR.i18n.aborting),e(".gdpr.gdpr-general-confirmation .gdpr-wrapper .gdpr-content p").html(GDPR.i18n.logging_out),e(".gdpr.gdpr-general-confirmation .gdpr-wrapper footer button").hide(),window.location.href=GDPR.logouturl},policyDisagreeCancel:function(){e(".gdpr.gdpr-general-confirmation .gdpr-wrapper").fadeOut(),e(".gdpr.gdpr-reconsent .gdpr-wrapper").fadeIn()}};if(-1!==r.indexOf("notify=1")&&(window.history.replaceState({},document.title,o),e("body").addClass("gdpr-notification")),e(document).on("click",".gdpr.gdpr-general-confirmation button",function(r){var o=e(this).data("callback");t[o]()}),e(document).on("submit",".gdpr-privacy-preferences-frm",function(r){r.preventDefault();e(this);var o=e(this).serialize();e.post(GDPR.ajaxurl,o,function(r){if(r.success)if(Cookies.set("gdpr[privacy_bar]",1,{expires:365}),GDPR.refresh)window.location.reload();else{var o=e("body").css("top");e(".gdpr-overlay").fadeOut(),e("body").removeClass("gdpr-noscroll"),e(window).scrollTop(Math.abs(parseInt(o,10))),e(".gdpr.gdpr-privacy-preferences .gdpr-wrapper").fadeOut(),e(".gdpr-privacy-bar").fadeOut()}else n(r.data.title,r.data.content)})}),e(document).on("submit",".gdpr-request-form",function(r){if(r.preventDefault(),e(this).hasClass("confirmed")){var o=e(this).serialize();e.post(GDPR.ajaxurl,o,function(e){n(e.data.title,e.data.content)})}}),e(document).on("change",".gdpr-cookie-category",function(){var r=e(this).data("category"),o=e(this).prop("checked");e('[data-category="'+r+'"]').prop("checked",o)}),Cookies.get("gdpr[privacy_bar]")||0==e(".gdpr-reconsent-bar, .gdpr-reconsent").length&&e(".gdpr.gdpr-privacy-bar").delay(1e3).slideDown(600),e(".gdpr-reconsent-bar").length>0&&e(".gdpr.gdpr-reconsent-bar").delay(1e3).slideDown(600),e(".gdpr-reconsent").length>0&&e(".gdpr-overlay").fadeIn(400,function(){e(".gdpr.gdpr-reconsent .gdpr-wrapper").fadeIn(),e("body").addClass("gdpr-noscroll").delay(1e3)}),e(document).on("click",".gdpr.gdpr-privacy-bar .gdpr-agreement",function(){e(".gdpr-privacy-preferences-frm").submit()}),e(document).on("click",".gdpr.gdpr-reconsent-bar .gdpr-agreement",function(){var r=[];e('.gdpr-policy-list input[type="hidden"]').each(function(){r.push(e(this).val())}),e.post(GDPR.ajaxurl,{action:"agree_with_new_policies",nonce:e(this).data("nonce"),consents:r},function(r){r.success?GDPR.refresh?window.location.reload():(e(".gdpr-reconsent-bar").slideUp(600),Cookies.get("gdpr[privacy_bar]")||e(".gdpr.gdpr-privacy-bar").delay(1e3).slideDown(600)):n(r.data.title,r.data.content)})}),e(document).on("submit",".gdpr-reconsent-frm",function(r){r.preventDefault();var o=[],t=e(this).find("#agree-with-new-policies-nonce").val();e(this).find('[name="gdpr-updated-policy"]').each(function(){o.push(e(this).val())}),e.post(GDPR.ajaxurl,{action:"agree_with_new_policies",nonce:t,consents:o},function(r){if(r.success)if(GDPR.refresh)window.location.reload();else{var o=e("body").css("top");e(".gdpr-overlay").fadeOut(),e("body").removeClass("gdpr-noscroll"),e(window).scrollTop(Math.abs(parseInt(o,10))),e(".gdpr.gdpr-reconsent .gdpr-wrapper").fadeOut(),Cookies.get("gdpr[privacy_bar]")||e(".gdpr.gdpr-privacy-bar").delay(1e3).slideDown(600)}else n(r.data.title,r.data.content)})}),e(document).on("click",".gdpr.gdpr-privacy-bar .gdpr-close, .gdpr.gdpr-reconsent-bar .gdpr-close",function(){var r=e("body").css("top");e(".gdpr-overlay").fadeOut(),e("body").removeClass("gdpr-noscroll"),e(window).scrollTop(Math.abs(parseInt(r,10))),e(".gdpr.gdpr-privacy-bar, .gdpr.gdpr-reconsent-bar").slideUp(600)}),e(document).on("click",".gdpr.gdpr-general-confirmation .gdpr-close",function(){var r=e("body").css("top");e(".gdpr-overlay").fadeOut(),e("body").removeClass("gdpr-noscroll"),e(window).scrollTop(Math.abs(parseInt(r,10))),e(".gdpr.gdpr-general-confirmation .gdpr-wrapper").fadeOut()}),e(document).on("click",".gdpr-preferences",function(r){r.preventDefault();var o=e(window).scrollTop(),n=e(this).data("tab");e(".gdpr-overlay").fadeIn(),e("body").addClass("gdpr-noscroll").css("top",-o),e(".gdpr.gdpr-privacy-preferences .gdpr-wrapper").fadeIn(),n&&e('.gdpr.gdpr-privacy-preferences .gdpr-wrapper .gdpr-tabs [data-target="'+n+'"]').click()}),e(document).on("click",".gdpr.gdpr-privacy-preferences .gdpr-close",function(r){r.preventDefault();var o=e("body").css("top");e(".gdpr-reconsent .gdpr-wrapper").is(":visible")||(e(".gdpr-overlay").fadeOut(),e("body").removeClass("gdpr-noscroll"),e(window).scrollTop(Math.abs(parseInt(o,10)))),e(".gdpr.gdpr-privacy-preferences .gdpr-wrapper").fadeOut()}),e(document).on("click",".gdpr.gdpr-privacy-preferences .gdpr-tabs button, .gdpr.gdpr-reconsent .gdpr-tabs button",function(){var r="."+e(this).data("target");e(".gdpr.gdpr-privacy-preferences .gdpr-tab-content > div, .gdpr.gdpr-reconsent .gdpr-tab-content > div").removeClass("gdpr-active"),e(".gdpr.gdpr-privacy-preferences .gdpr-tab-content "+r+", .gdpr.gdpr-reconsent .gdpr-tab-content "+r).addClass("gdpr-active"),e(".gdpr.gdpr-privacy-preferences .gdpr-tabs, .gdpr.gdpr-reconsent .gdpr-tabs").hasClass("gdpr-mobile-expanded")&&(e(".gdpr.gdpr-privacy-preferences .gdpr-mobile-menu button, .gdpr.gdpr-reconsent .gdpr-mobile-menu button").removeClass("gdpr-active"),e(".gdpr.gdpr-privacy-preferences .gdpr-tabs, .gdpr.gdpr-reconsent .gdpr-tabs").toggle()),e(".gdpr.gdpr-privacy-preferences .gdpr-tabs button, .gdpr.gdpr-reconsent .gdpr-tabs button").removeClass("gdpr-active"),e(".gdpr-subtabs li button").removeClass("gdpr-active"),e(this).hasClass("gdpr-tab-button")?(e(this).addClass("gdpr-active"),e(this).hasClass("gdpr-cookie-settings")&&e(".gdpr-subtabs").find("li button").first().addClass("gdpr-active")):(e(".gdpr-cookie-settings").addClass("gdpr-active"),e(this).addClass("gdpr-active"))}),e(document).on("click",".gdpr.gdpr-privacy-preferences .gdpr-mobile-menu button, .gdpr.gdpr-reconsent .gdpr-mobile-menu button",function(r){e(this).toggleClass("gdpr-active"),e(".gdpr.gdpr-privacy-preferences .gdpr-tabs, .gdpr.gdpr-reconsent .gdpr-tabs").toggle().addClass("gdpr-mobile-expanded")}),e(window).resize(function(){e(window).width()>640&&e(".gdpr.gdpr-privacy-preferences .gdpr-tabs, .gdpr.gdpr-reconsent .gdpr-tabs").hasClass("gdpr-mobile-expanded")&&(e(".gdpr.gdpr-privacy-preferences .gdpr-mobile-menu button, .gdpr.gdpr-reconsent .gdpr-mobile-menu button").removeClass("gdpr-active"),e(".gdpr.gdpr-privacy-preferences .gdpr-tabs, .gdpr.gdpr-reconsent .gdpr-tabs").removeClass("gdpr-mobile-expanded").removeAttr("style"))}),e("form.gdpr-add-to-deletion-requests").on("submit",function(r){if(!e(this).hasClass("confirmed")){r.preventDefault();var o=[{title:GDPR.i18n.ok,buttonClass:"gdpr-ok",callback:"addToDeletionConfirmed"},{title:GDPR.i18n.cancel,buttonClass:"gdpr-cancel",callback:"closeNotification"}];n(GDPR.i18n.close_account,GDPR.i18n.close_account_warning,o)}}),e("body").hasClass("gdpr-notification")){var d=e(window).scrollTop();e(".gdpr-overlay").fadeIn(400,function(){e(".gdpr.gdpr-general-confirmation .gdpr-wrapper").css({display:"flex"}).hide().fadeIn(),e("body").addClass("gdpr-noscroll").css("top",-d)})}e(document).on("click",".gdpr-disagree a",function(r){e(".gdpr.gdpr-reconsent .gdpr-wrapper").fadeOut();var o=[{title:GDPR.i18n.ok,buttonClass:"gdpr-ok",callback:"policyDisagreeOk"},{title:GDPR.i18n.cancel,buttonClass:"gdpr-cancel",callback:"policyDisagreeCancel"}];n(GDPR.i18n.are_you_sure,GDPR.i18n.policy_disagree,o,!0)})})}(jQuery),function(e){var r=!1;if("function"==typeof define&&define.amd&&(define(e),r=!0),"object"==typeof exports&&(module.exports=e(),r=!0),!r){var o=window.Cookies,n=window.Cookies=e();n.noConflict=function(){return window.Cookies=o,n}}}(function(){function e(){for(var e=0,r={};e<arguments.length;e++){var o=arguments[e];for(var n in o)r[n]=o[n]}return r}return function r(o){function n(r,t,d){var a;if("undefined"!=typeof document){if(arguments.length>1){if("number"==typeof(d=e({path:"/"},n.defaults,d)).expires){var p=new Date;p.setMilliseconds(p.getMilliseconds()+864e5*d.expires),d.expires=p}d.expires=d.expires?d.expires.toUTCString():"";try{a=JSON.stringify(t),/^[\{\[]/.test(a)&&(t=a)}catch(e){}t=o.write?o.write(t,r):encodeURIComponent(String(t)).replace(/%(23|24|26|2B|3A|3C|3E|3D|2F|3F|40|5B|5D|5E|60|7B|7D|7C)/g,decodeURIComponent),r=(r=(r=encodeURIComponent(String(r))).replace(/%(23|24|26|2B|5E|60|7C)/g,decodeURIComponent)).replace(/[\(\)]/g,escape);var i="";for(var c in d)d[c]&&(i+="; "+c,!0!==d[c]&&(i+="="+d[c]));return document.cookie=r+"="+t+i}r||(a={});for(var s=document.cookie?document.cookie.split("; "):[],g=/(%[0-9A-Z]{2})+/g,l=0;l<s.length;l++){var f=s[l].split("="),u=f.slice(1).join("=");this.json||'"'!==u.charAt(0)||(u=u.slice(1,-1));try{var b=f[0].replace(g,decodeURIComponent);if(u=o.read?o.read(u,b):o(u,b)||u.replace(g,decodeURIComponent),this.json)try{u=JSON.parse(u)}catch(e){}if(r===b){a=u;break}r||(a[b]=u)}catch(e){}}return a}}return n.set=n,n.get=function(e){return n.call(n,e)},n.getJSON=function(){return n.apply({json:!0},[].slice.call(arguments))},n.defaults={},n.remove=function(r,o){n(r,"",e(o,{expires:-1}))},n.withConverter=r,n}(function(){})});
\ No newline at end of file
diff --git a/includes/class-gdpr.php b/includes/class-gdpr.php
index 9882da23..f13a5c6c 100755
--- a/includes/class-gdpr.php
+++ b/includes/class-gdpr.php
@@ -304,9 +304,9 @@ public static function similar_in_array( $needle, $haystack ) {
 	public static function save_user_consent_on_registration( $user_id ) {
 		GDPR_Audit_Log::log( $user_id, esc_html__( 'User registered to the site.', 'gdpr' ) );
 
-		if ( isset( $_POST['user_consents'] ) ) {
+		if ( isset( $_POST['user_consents'] ) && is_array( $_POST['user_consents'] ) ) {
 
-			$consents = array_map( 'sanitize_text_field', array_keys( sanitize_text_field( wp_unslash( $_POST['user_consents'] ) ) ) );  // WPCS: Input var ok, CSRF ok.
+			$consents = array_map( 'sanitize_text_field', array_keys( wp_unslash( $_POST['user_consents'] ) ) );  // WPCS: Input var ok, CSRF ok, XSS ok.
 			foreach ( $consents as $consent ) {
 				/* translators: Name of consent */
 				GDPR_Audit_Log::log( $user_id, sprintf( esc_html__( 'User gave explicit consent to %s', 'gdpr' ), $consent ) );
@@ -326,7 +326,10 @@ public static function get_consent_checkboxes( $consent_key = false ) {
 		if ( empty( $consent_types ) ) {
 			return;
 		}
-		$sent_extras   = ( isset( $_POST['user_consents'] ) ) ? sanitize_text_field( wp_unslash( $_POST['user_consents'] ) ) : array(); // WPCS: Input var ok, CSRF ok.
+		$sent_extras   = ( isset( $_POST['user_consents'] ) ) ? wp_unslash( $_POST['user_consents'] ) : array(); // WPCS: Input var ok, CSRF ok.
+		if ( ! empty( $sent_extras ) ) {
+			$sent_extras = array_map( 'sanitize_text_field', $_POST['user_consents'] );
+		}
 		$allowed_html  = array(
 			'a' => array(
 				'href'   => true,
diff --git a/src/js/public/gdpr-public.js b/src/js/public/gdpr-public.js
index 613079f4..b40c44de 100644
--- a/src/js/public/gdpr-public.js
+++ b/src/js/public/gdpr-public.js
@@ -35,6 +35,7 @@
 				callback: 'closeNotification',
 			}
 		];
+    var scrollDistance = $(window).scrollTop();
 
 		$('.gdpr-general-confirmation .gdpr-box-title h3').html( title );
 		$('.gdpr-general-confirmation .gdpr-content p').html( text );
@@ -43,7 +44,6 @@
 			$('.gdpr-general-confirmation .gdpr-close').hide();
 		}
 
-
 		var html = '';
 		actions.forEach( function( index ) {
 			html += '<button class="'+ index.buttonClass +'" data-callback="' + index.callback + '">' + index.title + '</button>';
@@ -55,7 +55,7 @@
 			$('.gdpr.gdpr-general-confirmation .gdpr-wrapper').css({
 				'display': 'flex',
 			}).hide().fadeIn();
-			$('body').addClass('gdpr-noscroll');
+      $('body').addClass('gdpr-noscroll').css('top', -scrollDistance);
 		});
 	}
 
@@ -63,8 +63,10 @@
 
 		var gdprFunctions = {
 			closeNotification: function() {
+        var scrollDistance = $('body').css('top');
 				$('.gdpr-overlay').fadeOut();
 				$('body').removeClass('gdpr-noscroll');
+        $(window).scrollTop(Math.abs( parseInt( scrollDistance, 10 ) ) );
 				$('.gdpr.gdpr-general-confirmation .gdpr-wrapper').fadeOut();
 			},
 			addToDeletionConfirmed: function() {
@@ -108,8 +110,10 @@
 						if ( GDPR.refresh ) {
 							window.location.reload();
 						} else {
+              var scrollDistance = $('body').css('top');
 							$('.gdpr-overlay').fadeOut();
 							$('body').removeClass('gdpr-noscroll');
+							$(window).scrollTop(Math.abs( parseInt( scrollDistance, 10 ) ) );
 							$('.gdpr.gdpr-privacy-preferences .gdpr-wrapper').fadeOut();
 							$('.gdpr-privacy-bar').fadeOut();
 						}
@@ -216,8 +220,10 @@
 						if ( GDPR.refresh ) {
 							window.location.reload();
 						} else {
+              var scrollDistance = $('body').css('top');
 							$('.gdpr-overlay').fadeOut();
 							$('body').removeClass('gdpr-noscroll');
+              $(window).scrollTop(Math.abs( parseInt( scrollDistance, 10 ) ) );
 							$('.gdpr.gdpr-reconsent .gdpr-wrapper').fadeOut();
 							if ( ! Cookies.get('gdpr[privacy_bar]') ) {
 								$('.gdpr.gdpr-privacy-bar').delay(1000).slideDown(600);
@@ -234,19 +240,30 @@
 		 * Close the privacy/reconsent bar.
 		 */
 		$(document).on('click', '.gdpr.gdpr-privacy-bar .gdpr-close, .gdpr.gdpr-reconsent-bar .gdpr-close', function() {
+      var scrollDistance = $('body').css('top');
 			$('.gdpr-overlay').fadeOut();
 			$('body').removeClass('gdpr-noscroll');
+      $(window).scrollTop(Math.abs( parseInt( scrollDistance, 10 ) ) );
 			$('.gdpr.gdpr-privacy-bar, .gdpr.gdpr-reconsent-bar').slideUp(600);
 		});
 
+		$(document).on('click', '.gdpr.gdpr-general-confirmation .gdpr-close', function() {
+      var scrollDistance = $('body').css('top');
+			$('.gdpr-overlay').fadeOut();
+			$('body').removeClass('gdpr-noscroll');
+      $(window).scrollTop(Math.abs( parseInt( scrollDistance, 10 ) ) );
+			$('.gdpr.gdpr-general-confirmation .gdpr-wrapper').fadeOut();
+		});
+
 		/**
 		 * Display the privacy preferences modal.
 		 */
 		$(document).on('click', '.gdpr-preferences', function(e) {
 			e.preventDefault();
+			var scrollDistance = $(window).scrollTop();
 			var tab = $(this).data('tab');
 			$('.gdpr-overlay').fadeIn();
-			$('body').addClass('gdpr-noscroll');
+			$('body').addClass('gdpr-noscroll').css('top', -scrollDistance);
 			$('.gdpr.gdpr-privacy-preferences .gdpr-wrapper').fadeIn();
 			if ( tab ) {
 				$('.gdpr.gdpr-privacy-preferences .gdpr-wrapper .gdpr-tabs [data-target="' + tab + '"]').click();
@@ -256,10 +273,13 @@
 		/**
 		 * Close the privacy/reconsent preferences modal.
 		 */
-		$(document).on('click', '.gdpr.gdpr-privacy-preferences .gdpr-close', function() {
+		$(document).on('click', '.gdpr.gdpr-privacy-preferences .gdpr-close', function(e) {
+      e.preventDefault();
+      var scrollDistance = $('body').css('top');
 			if ( ! $('.gdpr-reconsent .gdpr-wrapper').is(':visible') ) {
 				$('.gdpr-overlay').fadeOut();
 				$('body').removeClass('gdpr-noscroll');
+        $(window).scrollTop(Math.abs( parseInt( scrollDistance, 10 ) ) );
 			}
 			$('.gdpr.gdpr-privacy-preferences .gdpr-wrapper').fadeOut();
 		});
@@ -326,11 +346,12 @@
 		} );
 
 		if ( $('body').hasClass('gdpr-notification') ) {
+      var scrollDistance = $(window).scrollTop();
 			$('.gdpr-overlay').fadeIn(400, function() {
 				$('.gdpr.gdpr-general-confirmation .gdpr-wrapper').css({
 					'display': 'flex',
 				}).hide().fadeIn();
-				$('body').addClass('gdpr-noscroll');
+        $('body').addClass('gdpr-noscroll').css('top', -scrollDistance);
 			});
 		}