Added basic search and display