Fix various bugs to get continous indexing to work without name finding