Fixes DB issues, with site specific collections being added under the current site id,
removing the requirement on models to have the site id appended to their id.