[fix] Navigation search algorithm now works properly.
Merge remote-tracking branch 'origin/master'