Added basic 'search' functionality.