2D range search should work now