complete all Query

complete all Query