?s are autoescaped in arguments now, fixes regex

Had a regex issue where ? wouldn't work because my pg wrapper was
assuming that meant to drop an argument there.
Merge branch 'master' into optimizedchains