search strategy improvement
Merge github.com:krajj7/pikater