am 54004373: Fix handling of double-byte chars for tags, keywords.

* commit '5400437364666d0a7d3bfd6ea721fe15e813d657':
  Fix handling of double-byte chars for tags, keywords.