Include deprecated services, and no longer use 'viewable by' when determining whether to include in public catalogue.