fixed #1 add expandable for map