fixed keywords functionality and added getter for keywords 'words' and 'non-words'