Fix Token Extraction

When "charset" is included in Content-Type header, token extraction failed.  This corrects that behaviour.