Change catalogs to collections for sub-catalogs and adding temporal and spatial extends