More formatting fixes for HATEOAS