RUBY-787 Only reference index batches if they exist