Separate catalog services from system services
Add catalog service container
Forward catalog requests to the catalog service
Bug fixes and misc enhancements