Fix catalog to work with new resources and subresources - RESTWS-350