Feature/fix geo near

/to @ritch