fix search results
fix merge
Merge branch 'master' of https://github.com/dyg2104/newstips