Make sure catalogtree reflects state of map all the time

This addresses issue #604