roll back to simple query