completed correction of tor2web regexps