Feature/fix search #87

Closed btdat1412 closed 2 weeks ago