Fix problems with finder indexing and statistics