#add saferun & fix id/CF-167