Ensure that we do not try to id = 'string'
Pass the Catalog (which is the fetched DefaultCatalog) down into SimpleSearch

Previously, we limited to Catalog IS NULL
Accept Catalog as either an object or an id/name to load