Refactored catalog code & fixed N+1 query
Renamed entities:catalog and fixed some queries