Make csv and xml CLI indexing options consistent