Fixed reg-exp
Added assignment of transaction group