Modified query tracking output