Fix Zone Query 3