modify serch logic and UI