#24, fixing an issue that can cause search to crash if no resources are nearby
Merge remote-tracking branch 'upstream/master'