fix #19 for Accordion control
fix #19 for Basic Tab Display control