I really don’t want to reconstruct whole setup to be able to test it.
When you have the project directly in front of your eyes, it is much easier to DEBUG it.
If you want i can take a look directly on your project.
You will find my contact in my profile.