Fixed a couple of bugs in datalist