Focus is on SearchTextBox when user expands / collapses category
Some small bugs are fixed