Merge pull request #69 from bhariharan/unstable20

Merge 'unstable' into unstable20
Use right query param for SOSL
Merge pull request #70 from bhariharan/master

Use right query param for SOSL
Merge branch 'master' into unstable20