Tidy up JSON response headers & add in other services