Added SearchByName functionality