Fix near search, route search