Feature/1632 enhance search

Yeah baby