Enhancements manual searching

Sorry, did a pull before PR, and it merged automatically. Also can't combine the commits. Can you Pull it like this?