Fixing issues with the site identifier