Fixed bugs with the '%3F' handling