Fixing and finishing the REST WS