Modified IsHashed to use new Hashed category.  Other changes to various regex to improve matching.