Update search function and style

Additional:
1. improve search keyword handling