enable the use of the last match back reference
normalise the query string in the computed to in case it's malformed after substitution
Merge pull request #1 from benpritchard/master

Enable use of last match back reference and fix resultant query string if malformed