improved the whole handling of switching catalogs en load of new catalogs. should now be consistent