Prevent double-encoding of special characters

Closes #89