Updated to use fulltext search