Added search functionality, untested