ENHANCEMENT make compatible with non-multisite sites