Fixed Full user query and URL encoding of image names.
Merge origin/master