Fix Zone Query 6