Remove bundle from dataset entity and fix dataset id key