No.1, I have fixed for you. But i think that your site is very slow, maybe it comes from that plugin. You need to consider. We added in the theme and update.
No.2, We already created this task for update in the future. Thank you for your ideas.