Trying to handle the '?' to '%3F' problem