Add DataSet Id edit field, fix bug with displaying 'Extras' lines.