iss18-rest-api: incoperate fixes