added maplist and fixed error