Performance improvement for analyst analyze wizard.