Further improve multiselect handling

Now properly responds to clicks on the expand/collapse icon where it would simply be ignored before