Fix: problem with handling normal SQL queries