Clusterfuck-selection panel now seems to work