Add group_name to json response
Fix keyword group at Match json