Started revising query binding