added entry type and fixed other groups