fix search  errors
fix search  errors
Merge remote-tracking branch 'origin/master'