Added survey and search functionality