(#62503734)  make search algorithm

https://www.pivotaltracker.com/story/show/62503734