URL-Encoding bugfix - naja