Allow combined search to be optional per class