Rest search query

Rebase