Fixed the site url issues with in apps and system