Fix regexps for new site layout