Code Ready and merged, datalist although is suddenly empty

Has to be fixed, but in generally ready!