Add binding to search for current word
Cleanup