Added search functionallity