Sorry for being months late to this. A new version has been released to fix both of your issues. Let me know if this works!
Version: v2.0.0
I used an old version of this a long time ago with 1.7.2. Now using 1.16.5 & glad to see this is available and works just like the old one. It saved me a lot of time. Thank you.