fixed issue with map and list modes