Search by distance by default, not final solution refs #4899