stopwords handling extended and improved