even more HATEOAS fixes