fixed search bugs
Merge branch 'devtim'