group fixes, group auto loading, group etag, refactoring