Fixed and improved usage of sample data to select run.