Fixes for expanding/collapsing categories