I think I’ve managed how to solve this. @Frank419 can you please check this pull request solves the problem? Or just confirm the “Before” checklist in the pull request.
Hello Simone, I currently cannot check it because I don’t have access to a CP site right now. The pull request “before” looks right. Thanks for checking.