Fix avoid attempting to rebuild the index,and retries features