add placeholders before CGI escapes
Merge pull request #31 from bwhaley/master

URL placeholders broken by CGI escapes