Fix parsing charset strings with semicolon

Avoid problem with charset defined as utf-8;
saw a couple of WARN messages saying "Cannot convert from UTF-8; to utf-8:..."