Minor changes on NearestStrategy