Fix to support values with different encodings

Been running into this and it seems like when the values get quoted they can get turned into different kinds of encodings, which causes an error when they are combined.

Fix included with tests.  Let me know if you have any questions