Enhancements manual searching

Sorry, had to do a Pull in between. But it did a merge instead.
Can you pull it like this?