minor fixes to catalogue
moved catalogue handler logic