Added check for default site