datalist fixes + testcases