support contain queries
Merge branch 'dev'

* dev:
  support contain queries