Fix Zone Query