Changes to RESTful services to fix issues with GF 4.1