Improvements in innerwiki and connect regexps