Enhancement/fts

Little enhancements on full-text search feature.