CORE-4031: fixed a couple of problems with tool request notifications