(sub)sites that start with the name of an other site do not work

If for example I add a site called 'demosite_fr' but there is already a website called 'demosite' , we run into many issues. Most likely because I use 'startsWith' logic in some places