Image Query bug fixed