Solve issue searching. Fix #27