Hi Danna,
I’ve tried to re-create the issues, especially the empty content one, but I’m not able to on my test servers.
Can you please add temporary FTP and back-end access as well? I would like to do a step-by-step debugging on the plugin code to see where the override fails, and also check why the content issue is happening.