Added support for querying non-standard characters