Cleanup, small bugfix for CatalogLinks