FIX: Unicode Regex match
FIX: internal variables update