fix agent type selection for the simple case, RT#30942, RT#28804