MODE-2302 Added an additional fix for retrieving the extracted text and a minor cleanup for the FileSystemBinaryStore.