Improve search when key input