Added capability to rebind an existing query