Include search and edit capability