Better Handling of MultiSite Settings