Glad you sorted it out 🙂
Mostly for the benefit of other users coming across this thread, please remember it’s generally recommended that you do not modify core plugin code: any changes will be overwritten on the next update (so you’ll need to manually restore them) – and, on occasion, we have seen situations where users forgot about such modifications resulting in strange side effects that were hard to track down.
So long as you’re fully aware of this and it works for you though that’s the main thing – thanks for posting the update and I hope everything else goes smoothly for you.