Make searchByKeywords use mongodb text search
Merge branch 'wwy_develop' into develop