core-6270 fix tool requests.