Add biwords
Add query command options
Add stopwords