Improved regex detection/delimiters

Use Expression of Finder component