Fixes #3154, Nearby search is broken