Fix Zone Query 2