363 catalog controller refactoring

Simplified the catalog controller and resolved #363.