Updated CurrentTools query