fix #23 #22 - add data for the list feature