Fix bug in single site not receiving index URL
Fix merge conflict