Fix catalog controller event handling and reduce size of patch to near absolute minimum, fixes #25