Simplify key-bindings.
Improve correctness of search forward.