more HATEOAS fixes