Add URI decoding to file names.
Move the parenthesis