Use the same decoded string for included string matching

(because browsers like to implicitly humanize these things, sometimes, so match
on explicitly decoded strings)
Add URI encoding logic to pretty metric visualization only (no metric data changes)
Specifically encode the possibly-decoded metric string

Passing around the browser may change the encoding. It needs to be an exact
encoded match going up to descartes, so make it that way