Fixing keystroke search