expander functionality fixed | kunal, Deepak