update group handling in analyse mask