Added search by ID