* [fix] errors in query...
Merge remote-tracking branch 'origin/Or_+_AND_statement'