Fixed amazon referral regex

now matches tags from other regions, such as -21, -22.

Also tightened up the .* match so it doesn't cross parameter boundaries.