JS-111 BookIndexer does not wait for indexing to complete
Applied Martin Denham's patch