Updated tokenizer and added tagwords to title, text fields [PD-497]