much more multisite support

this doesn't change much but it will be needed for huggle 3.1.0