Added more functionality (fulltext)