Fix near search