Instead of tracking the time of the last incoming query reply, the time of the last incoming message is tracked. That includes query replies and heartbeats