Moved regex construction partially to Attribute, to hide more visibility
Fixed