confirmation, query bug fix