Added search funcitonality