improved the handling of catalog switches