added a fix if id is given in the request