Merge "Fix more options dataset index" into main