Minor changes in request_handler