added where clause charset support