THA added.
Less strict matching.
Added charset reference.