use guava escapers
put the annotation part in the textual representation of the URI before the actual URI

also make the matched annotation an explicit part of the Match class.