Fix Zone Query 7