add more search options
Merge branch 'dev'

add more search options ...