updates to hashtag parsing and removal from token list