Add setting to AND and OR