Fulltext search refinements

David, please review this one.