add regex converter to restriction_formatter, some minor fixes in matcher.py