Further hashtag and username parsing improvements