Declare buffer name
Use buffer name
Move
Fixup search logic