Both fixes would improve things, but making the dataset clickable -- similar to how Input Model is clickable -- would be best.