URL Encode fix, issue #553

@jagtalon done.