Some fixes to support multiple restful items