Fixed data select issue. Was adding rows