Enhancements manual searching 

Rebased and squashed @KontiSR's PR #798