updated Search class