Added no_results_fallback_option_index
Merge