Fix issue #17 and issue #18 for vim search command