Improved handling of default site