Fix underscore ('_') encoding

encodes underscores. Please review ;-)