khanhbq: change logic search