optimizing search strings -- second half
Merge branch 'mvp' of https://github.com/yennycheung/swatCoRe into mvp
merge