fix bug triggered by using search and public params together
Merge branch 'master' into RELEASE_20140325