More robust full text indexing. re #24