Minor update, works pretty well except for string with and without entity encoding