Fixed singular query bug.