Added TODO.
Update comment and bug-fix for url unescaping.