fixes #1957 Refactors Controllers that extend CatalogController so that they only include the necessary modules & methods