added search functionality (mark 1)