Fix slow match with multi-selection