fixes more from/to encoding issues on the server