Enhance dsn regular expressions handling [ref #30]