Improve search for vim