Remove redundant keywords
Change keyword for flexible search
Add more keywords

Related to #11.