Improve basicRowFind()