MB-135 #groups.sql normalized and functionality fixed