Hello, @Azza,
Yes right, Does my proposed solution help you in solving your issue?
Do you need any more help from me on this issue? OR should I close this topic now?
Regards 8Themes Team.