Fix double entries for groups and locations