minor changes in request handler