add Search class and work fine as expected