Tweaked matching for URL encoding/decoding