updated field names in Catalog Controller and added jettywrapper