Feature/proximity search