diff --git a/presets/america.yaml b/presets/america.yaml index aa4c8f165..0f45380f6 100644 --- a/presets/america.yaml +++ b/presets/america.yaml @@ -1043,12 +1043,33 @@ presets: - left: typespecs operation: has_none_of right: preferred - - left: type - operation: in_range - right: - - stock - - dr - - structured + filter2: + operator: or + operands: + - operation: + operator: and + operands: + - expression: + left: type + operation: in_range + right: + - stock + - dr + - structured + - operation: + operator: and + operands: + - expression: + left: type + operation: equal + right: fund + - expression: + left: typespecs + operation: has + right: + - reit + - trust + - closeend sort: sortBy: market_cap_basic sortOrder: desc diff --git a/presets/argentina.yaml b/presets/argentina.yaml index 9ccf78b80..f004e8084 100644 --- a/presets/argentina.yaml +++ b/presets/argentina.yaml @@ -584,12 +584,33 @@ presets: - left: typespecs operation: has_none_of right: preferred - - left: type - operation: in_range - right: - - stock - - dr - - structured + filter2: + operator: or + operands: + - operation: + operator: and + operands: + - expression: + left: type + operation: in_range + right: + - stock + - dr + - structured + - operation: + operator: and + operands: + - expression: + left: type + operation: equal + right: fund + - expression: + left: typespecs + operation: has + right: + - reit + - trust + - closeend sort: sortBy: market_cap_basic sortOrder: desc diff --git a/presets/australia.yaml b/presets/australia.yaml index da9f155ee..45c6dc326 100644 --- a/presets/australia.yaml +++ b/presets/australia.yaml @@ -584,12 +584,33 @@ presets: - left: typespecs operation: has_none_of right: preferred - - left: type - operation: in_range - right: - - stock - - dr - - structured + filter2: + operator: or + operands: + - operation: + operator: and + operands: + - expression: + left: type + operation: in_range + right: + - stock + - dr + - structured + - operation: + operator: and + operands: + - expression: + left: type + operation: equal + right: fund + - expression: + left: typespecs + operation: has + right: + - reit + - trust + - closeend sort: sortBy: market_cap_basic sortOrder: desc diff --git a/presets/austria.yaml b/presets/austria.yaml index 210954e3f..2e4d3775b 100644 --- a/presets/austria.yaml +++ b/presets/austria.yaml @@ -569,12 +569,33 @@ presets: - left: typespecs operation: has_none_of right: preferred - - left: type - operation: in_range - right: - - stock - - dr - - structured + filter2: + operator: or + operands: + - operation: + operator: and + operands: + - expression: + left: type + operation: in_range + right: + - stock + - dr + - structured + - operation: + operator: and + operands: + - expression: + left: type + operation: equal + right: fund + - expression: + left: typespecs + operation: has + right: + - reit + - trust + - closeend sort: sortBy: market_cap_basic sortOrder: desc diff --git a/presets/bahrain.yaml b/presets/bahrain.yaml index 25470fab5..fada55268 100644 --- a/presets/bahrain.yaml +++ b/presets/bahrain.yaml @@ -584,12 +584,33 @@ presets: - left: typespecs operation: has_none_of right: preferred - - left: type - operation: in_range - right: - - stock - - dr - - structured + filter2: + operator: or + operands: + - operation: + operator: and + operands: + - expression: + left: type + operation: in_range + right: + - stock + - dr + - structured + - operation: + operator: and + operands: + - expression: + left: type + operation: equal + right: fund + - expression: + left: typespecs + operation: has + right: + - reit + - trust + - closeend sort: sortBy: market_cap_basic sortOrder: desc diff --git a/presets/bangladesh.yaml b/presets/bangladesh.yaml index 459359198..7cb0386e0 100644 --- a/presets/bangladesh.yaml +++ b/presets/bangladesh.yaml @@ -569,12 +569,33 @@ presets: - left: typespecs operation: has_none_of right: preferred - - left: type - operation: in_range - right: - - stock - - dr - - structured + filter2: + operator: or + operands: + - operation: + operator: and + operands: + - expression: + left: type + operation: in_range + right: + - stock + - dr + - structured + - operation: + operator: and + operands: + - expression: + left: type + operation: equal + right: fund + - expression: + left: typespecs + operation: has + right: + - reit + - trust + - closeend sort: sortBy: market_cap_basic sortOrder: desc diff --git a/presets/belgium.yaml b/presets/belgium.yaml index cdae5ef42..5a494b1cd 100644 --- a/presets/belgium.yaml +++ b/presets/belgium.yaml @@ -584,12 +584,33 @@ presets: - left: typespecs operation: has_none_of right: preferred - - left: type - operation: in_range - right: - - stock - - dr - - structured + filter2: + operator: or + operands: + - operation: + operator: and + operands: + - expression: + left: type + operation: in_range + right: + - stock + - dr + - structured + - operation: + operator: and + operands: + - expression: + left: type + operation: equal + right: fund + - expression: + left: typespecs + operation: has + right: + - reit + - trust + - closeend sort: sortBy: market_cap_basic sortOrder: desc diff --git a/presets/brazil.yaml b/presets/brazil.yaml index b9d991fca..c5d863a89 100644 --- a/presets/brazil.yaml +++ b/presets/brazil.yaml @@ -662,12 +662,33 @@ presets: - left: typespecs operation: has_none_of right: preferred - - left: type - operation: in_range - right: - - stock - - dr - - structured + filter2: + operator: or + operands: + - operation: + operator: and + operands: + - expression: + left: type + operation: in_range + right: + - stock + - dr + - structured + - operation: + operator: and + operands: + - expression: + left: type + operation: equal + right: fund + - expression: + left: typespecs + operation: has + right: + - reit + - trust + - closeend sort: sortBy: market_cap_basic sortOrder: desc diff --git a/presets/canada.yaml b/presets/canada.yaml index 4d5e22d46..b0539d496 100644 --- a/presets/canada.yaml +++ b/presets/canada.yaml @@ -590,12 +590,33 @@ presets: - left: typespecs operation: has_none_of right: preferred - - left: type - operation: in_range - right: - - stock - - dr - - structured + filter2: + operator: or + operands: + - operation: + operator: and + operands: + - expression: + left: type + operation: in_range + right: + - stock + - dr + - structured + - operation: + operator: and + operands: + - expression: + left: type + operation: equal + right: fund + - expression: + left: typespecs + operation: has + right: + - reit + - trust + - closeend sort: sortBy: market_cap_basic sortOrder: desc diff --git a/presets/chile.yaml b/presets/chile.yaml index 8e5ba75ef..efac72647 100644 --- a/presets/chile.yaml +++ b/presets/chile.yaml @@ -584,12 +584,33 @@ presets: - left: typespecs operation: has_none_of right: preferred - - left: type - operation: in_range - right: - - stock - - dr - - structured + filter2: + operator: or + operands: + - operation: + operator: and + operands: + - expression: + left: type + operation: in_range + right: + - stock + - dr + - structured + - operation: + operator: and + operands: + - expression: + left: type + operation: equal + right: fund + - expression: + left: typespecs + operation: has + right: + - reit + - trust + - closeend sort: sortBy: market_cap_basic sortOrder: desc diff --git a/presets/china.yaml b/presets/china.yaml index 43da37454..c78484e61 100644 --- a/presets/china.yaml +++ b/presets/china.yaml @@ -584,12 +584,33 @@ presets: - left: typespecs operation: has_none_of right: preferred - - left: type - operation: in_range - right: - - stock - - dr - - structured + filter2: + operator: or + operands: + - operation: + operator: and + operands: + - expression: + left: type + operation: in_range + right: + - stock + - dr + - structured + - operation: + operator: and + operands: + - expression: + left: type + operation: equal + right: fund + - expression: + left: typespecs + operation: has + right: + - reit + - trust + - closeend sort: sortBy: market_cap_basic sortOrder: desc diff --git a/presets/colombia.yaml b/presets/colombia.yaml index 2eb391ec0..168f9f570 100644 --- a/presets/colombia.yaml +++ b/presets/colombia.yaml @@ -584,12 +584,33 @@ presets: - left: typespecs operation: has_none_of right: preferred - - left: type - operation: in_range - right: - - stock - - dr - - structured + filter2: + operator: or + operands: + - operation: + operator: and + operands: + - expression: + left: type + operation: in_range + right: + - stock + - dr + - structured + - operation: + operator: and + operands: + - expression: + left: type + operation: equal + right: fund + - expression: + left: typespecs + operation: has + right: + - reit + - trust + - closeend sort: sortBy: market_cap_basic sortOrder: desc diff --git a/presets/cyprus.yaml b/presets/cyprus.yaml index c914637f2..0e744cff9 100644 --- a/presets/cyprus.yaml +++ b/presets/cyprus.yaml @@ -569,12 +569,33 @@ presets: - left: typespecs operation: has_none_of right: preferred - - left: type - operation: in_range - right: - - stock - - dr - - structured + filter2: + operator: or + operands: + - operation: + operator: and + operands: + - expression: + left: type + operation: in_range + right: + - stock + - dr + - structured + - operation: + operator: and + operands: + - expression: + left: type + operation: equal + right: fund + - expression: + left: typespecs + operation: has + right: + - reit + - trust + - closeend sort: sortBy: market_cap_basic sortOrder: desc diff --git a/presets/czech.yaml b/presets/czech.yaml index 5ad1e6a23..89b816b26 100644 --- a/presets/czech.yaml +++ b/presets/czech.yaml @@ -569,12 +569,33 @@ presets: - left: typespecs operation: has_none_of right: preferred - - left: type - operation: in_range - right: - - stock - - dr - - structured + filter2: + operator: or + operands: + - operation: + operator: and + operands: + - expression: + left: type + operation: in_range + right: + - stock + - dr + - structured + - operation: + operator: and + operands: + - expression: + left: type + operation: equal + right: fund + - expression: + left: typespecs + operation: has + right: + - reit + - trust + - closeend sort: sortBy: market_cap_basic sortOrder: desc diff --git a/presets/denmark.yaml b/presets/denmark.yaml index 53042d248..1af4b7b3b 100644 --- a/presets/denmark.yaml +++ b/presets/denmark.yaml @@ -584,12 +584,33 @@ presets: - left: typespecs operation: has_none_of right: preferred - - left: type - operation: in_range - right: - - stock - - dr - - structured + filter2: + operator: or + operands: + - operation: + operator: and + operands: + - expression: + left: type + operation: in_range + right: + - stock + - dr + - structured + - operation: + operator: and + operands: + - expression: + left: type + operation: equal + right: fund + - expression: + left: typespecs + operation: has + right: + - reit + - trust + - closeend sort: sortBy: market_cap_basic sortOrder: desc diff --git a/presets/egypt.yaml b/presets/egypt.yaml index ea03a5450..03146f523 100644 --- a/presets/egypt.yaml +++ b/presets/egypt.yaml @@ -584,12 +584,33 @@ presets: - left: typespecs operation: has_none_of right: preferred - - left: type - operation: in_range - right: - - stock - - dr - - structured + filter2: + operator: or + operands: + - operation: + operator: and + operands: + - expression: + left: type + operation: in_range + right: + - stock + - dr + - structured + - operation: + operator: and + operands: + - expression: + left: type + operation: equal + right: fund + - expression: + left: typespecs + operation: has + right: + - reit + - trust + - closeend sort: sortBy: market_cap_basic sortOrder: desc diff --git a/presets/estonia.yaml b/presets/estonia.yaml index 8187f32f6..5cb34fd41 100644 --- a/presets/estonia.yaml +++ b/presets/estonia.yaml @@ -569,12 +569,33 @@ presets: - left: typespecs operation: has_none_of right: preferred - - left: type - operation: in_range - right: - - stock - - dr - - structured + filter2: + operator: or + operands: + - operation: + operator: and + operands: + - expression: + left: type + operation: in_range + right: + - stock + - dr + - structured + - operation: + operator: and + operands: + - expression: + left: type + operation: equal + right: fund + - expression: + left: typespecs + operation: has + right: + - reit + - trust + - closeend sort: sortBy: market_cap_basic sortOrder: desc diff --git a/presets/finland.yaml b/presets/finland.yaml index 021232f4b..e25678bd2 100644 --- a/presets/finland.yaml +++ b/presets/finland.yaml @@ -584,12 +584,33 @@ presets: - left: typespecs operation: has_none_of right: preferred - - left: type - operation: in_range - right: - - stock - - dr - - structured + filter2: + operator: or + operands: + - operation: + operator: and + operands: + - expression: + left: type + operation: in_range + right: + - stock + - dr + - structured + - operation: + operator: and + operands: + - expression: + left: type + operation: equal + right: fund + - expression: + left: typespecs + operation: has + right: + - reit + - trust + - closeend sort: sortBy: market_cap_basic sortOrder: desc diff --git a/presets/france.yaml b/presets/france.yaml index 3f746660b..8c32e924f 100644 --- a/presets/france.yaml +++ b/presets/france.yaml @@ -584,12 +584,33 @@ presets: - left: typespecs operation: has_none_of right: preferred - - left: type - operation: in_range - right: - - stock - - dr - - structured + filter2: + operator: or + operands: + - operation: + operator: and + operands: + - expression: + left: type + operation: in_range + right: + - stock + - dr + - structured + - operation: + operator: and + operands: + - expression: + left: type + operation: equal + right: fund + - expression: + left: typespecs + operation: has + right: + - reit + - trust + - closeend sort: sortBy: market_cap_basic sortOrder: desc diff --git a/presets/germany.yaml b/presets/germany.yaml index 336781124..eb044a2c3 100644 --- a/presets/germany.yaml +++ b/presets/germany.yaml @@ -588,12 +588,33 @@ presets: - left: typespecs operation: has_none_of right: preferred - - left: type - operation: in_range - right: - - stock - - dr - - structured + filter2: + operator: or + operands: + - operation: + operator: and + operands: + - expression: + left: type + operation: in_range + right: + - stock + - dr + - structured + - operation: + operator: and + operands: + - expression: + left: type + operation: equal + right: fund + - expression: + left: typespecs + operation: has + right: + - reit + - trust + - closeend sort: sortBy: market_cap_basic sortOrder: desc diff --git a/presets/greece.yaml b/presets/greece.yaml index a8c95aab7..01477ff88 100644 --- a/presets/greece.yaml +++ b/presets/greece.yaml @@ -584,12 +584,33 @@ presets: - left: typespecs operation: has_none_of right: preferred - - left: type - operation: in_range - right: - - stock - - dr - - structured + filter2: + operator: or + operands: + - operation: + operator: and + operands: + - expression: + left: type + operation: in_range + right: + - stock + - dr + - structured + - operation: + operator: and + operands: + - expression: + left: type + operation: equal + right: fund + - expression: + left: typespecs + operation: has + right: + - reit + - trust + - closeend sort: sortBy: market_cap_basic sortOrder: desc diff --git a/presets/hongkong.yaml b/presets/hongkong.yaml index 003901b2f..47d05b2e3 100644 --- a/presets/hongkong.yaml +++ b/presets/hongkong.yaml @@ -584,12 +584,33 @@ presets: - left: typespecs operation: has_none_of right: preferred - - left: type - operation: in_range - right: - - stock - - dr - - structured + filter2: + operator: or + operands: + - operation: + operator: and + operands: + - expression: + left: type + operation: in_range + right: + - stock + - dr + - structured + - operation: + operator: and + operands: + - expression: + left: type + operation: equal + right: fund + - expression: + left: typespecs + operation: has + right: + - reit + - trust + - closeend sort: sortBy: market_cap_basic sortOrder: desc diff --git a/presets/hungary.yaml b/presets/hungary.yaml index 924e96738..1a5903805 100644 --- a/presets/hungary.yaml +++ b/presets/hungary.yaml @@ -569,12 +569,33 @@ presets: - left: typespecs operation: has_none_of right: preferred - - left: type - operation: in_range - right: - - stock - - dr - - structured + filter2: + operator: or + operands: + - operation: + operator: and + operands: + - expression: + left: type + operation: in_range + right: + - stock + - dr + - structured + - operation: + operator: and + operands: + - expression: + left: type + operation: equal + right: fund + - expression: + left: typespecs + operation: has + right: + - reit + - trust + - closeend sort: sortBy: market_cap_basic sortOrder: desc diff --git a/presets/iceland.yaml b/presets/iceland.yaml index 893a20c4e..09c1be9f4 100644 --- a/presets/iceland.yaml +++ b/presets/iceland.yaml @@ -584,12 +584,33 @@ presets: - left: typespecs operation: has_none_of right: preferred - - left: type - operation: in_range - right: - - stock - - dr - - structured + filter2: + operator: or + operands: + - operation: + operator: and + operands: + - expression: + left: type + operation: in_range + right: + - stock + - dr + - structured + - operation: + operator: and + operands: + - expression: + left: type + operation: equal + right: fund + - expression: + left: typespecs + operation: has + right: + - reit + - trust + - closeend sort: sortBy: market_cap_basic sortOrder: desc diff --git a/presets/india.yaml b/presets/india.yaml index 43a37ea5a..8c624f8cb 100644 --- a/presets/india.yaml +++ b/presets/india.yaml @@ -592,12 +592,33 @@ presets: - left: is_primary operation: equal right: true - - left: type - operation: in_range - right: - - stock - - dr - - structured + filter2: + operator: or + operands: + - operation: + operator: and + operands: + - expression: + left: type + operation: in_range + right: + - stock + - dr + - structured + - operation: + operator: and + operands: + - expression: + left: type + operation: equal + right: fund + - expression: + left: typespecs + operation: has + right: + - reit + - trust + - closeend sort: sortBy: market_cap_basic sortOrder: desc diff --git a/presets/indonesia.yaml b/presets/indonesia.yaml index 83d6ac11f..1e50c2bf6 100644 --- a/presets/indonesia.yaml +++ b/presets/indonesia.yaml @@ -584,12 +584,33 @@ presets: - left: typespecs operation: has_none_of right: preferred - - left: type - operation: in_range - right: - - stock - - dr - - structured + filter2: + operator: or + operands: + - operation: + operator: and + operands: + - expression: + left: type + operation: in_range + right: + - stock + - dr + - structured + - operation: + operator: and + operands: + - expression: + left: type + operation: equal + right: fund + - expression: + left: typespecs + operation: has + right: + - reit + - trust + - closeend sort: sortBy: market_cap_basic sortOrder: desc diff --git a/presets/ireland.yaml b/presets/ireland.yaml index ffbe05cf6..7845574b3 100644 --- a/presets/ireland.yaml +++ b/presets/ireland.yaml @@ -584,12 +584,33 @@ presets: - left: typespecs operation: has_none_of right: preferred - - left: type - operation: in_range - right: - - stock - - dr - - structured + filter2: + operator: or + operands: + - operation: + operator: and + operands: + - expression: + left: type + operation: in_range + right: + - stock + - dr + - structured + - operation: + operator: and + operands: + - expression: + left: type + operation: equal + right: fund + - expression: + left: typespecs + operation: has + right: + - reit + - trust + - closeend sort: sortBy: market_cap_basic sortOrder: desc diff --git a/presets/israel.yaml b/presets/israel.yaml index d70b4b5dd..adf7ebbea 100644 --- a/presets/israel.yaml +++ b/presets/israel.yaml @@ -584,12 +584,33 @@ presets: - left: typespecs operation: has_none_of right: preferred - - left: type - operation: in_range - right: - - stock - - dr - - structured + filter2: + operator: or + operands: + - operation: + operator: and + operands: + - expression: + left: type + operation: in_range + right: + - stock + - dr + - structured + - operation: + operator: and + operands: + - expression: + left: type + operation: equal + right: fund + - expression: + left: typespecs + operation: has + right: + - reit + - trust + - closeend sort: sortBy: market_cap_basic sortOrder: desc diff --git a/presets/italy.yaml b/presets/italy.yaml index 98178826e..c3f2240ce 100644 --- a/presets/italy.yaml +++ b/presets/italy.yaml @@ -584,12 +584,33 @@ presets: - left: typespecs operation: has_none_of right: preferred - - left: type - operation: in_range - right: - - stock - - dr - - structured + filter2: + operator: or + operands: + - operation: + operator: and + operands: + - expression: + left: type + operation: in_range + right: + - stock + - dr + - structured + - operation: + operator: and + operands: + - expression: + left: type + operation: equal + right: fund + - expression: + left: typespecs + operation: has + right: + - reit + - trust + - closeend sort: sortBy: market_cap_basic sortOrder: desc diff --git a/presets/japan.yaml b/presets/japan.yaml index 5fcbc6e7a..dac15e450 100644 --- a/presets/japan.yaml +++ b/presets/japan.yaml @@ -588,12 +588,33 @@ presets: - left: typespecs operation: has_none_of right: preferred - - left: type - operation: in_range - right: - - stock - - dr - - structured + filter2: + operator: or + operands: + - operation: + operator: and + operands: + - expression: + left: type + operation: in_range + right: + - stock + - dr + - structured + - operation: + operator: and + operands: + - expression: + left: type + operation: equal + right: fund + - expression: + left: typespecs + operation: has + right: + - reit + - trust + - closeend sort: sortBy: market_cap_basic sortOrder: desc diff --git a/presets/kenya.yaml b/presets/kenya.yaml index c6662d990..bffd4ccfe 100644 --- a/presets/kenya.yaml +++ b/presets/kenya.yaml @@ -569,12 +569,33 @@ presets: - left: typespecs operation: has_none_of right: preferred - - left: type - operation: in_range - right: - - stock - - dr - - structured + filter2: + operator: or + operands: + - operation: + operator: and + operands: + - expression: + left: type + operation: in_range + right: + - stock + - dr + - structured + - operation: + operator: and + operands: + - expression: + left: type + operation: equal + right: fund + - expression: + left: typespecs + operation: has + right: + - reit + - trust + - closeend sort: sortBy: market_cap_basic sortOrder: desc diff --git a/presets/korea.yaml b/presets/korea.yaml index d63623fa9..efd2d093b 100644 --- a/presets/korea.yaml +++ b/presets/korea.yaml @@ -584,12 +584,33 @@ presets: - left: typespecs operation: has_none_of right: preferred - - left: type - operation: in_range - right: - - stock - - dr - - structured + filter2: + operator: or + operands: + - operation: + operator: and + operands: + - expression: + left: type + operation: in_range + right: + - stock + - dr + - structured + - operation: + operator: and + operands: + - expression: + left: type + operation: equal + right: fund + - expression: + left: typespecs + operation: has + right: + - reit + - trust + - closeend sort: sortBy: market_cap_basic sortOrder: desc diff --git a/presets/ksa.yaml b/presets/ksa.yaml index 79e61cf93..15668b937 100644 --- a/presets/ksa.yaml +++ b/presets/ksa.yaml @@ -584,12 +584,33 @@ presets: - left: typespecs operation: has_none_of right: preferred - - left: type - operation: in_range - right: - - stock - - dr - - structured + filter2: + operator: or + operands: + - operation: + operator: and + operands: + - expression: + left: type + operation: in_range + right: + - stock + - dr + - structured + - operation: + operator: and + operands: + - expression: + left: type + operation: equal + right: fund + - expression: + left: typespecs + operation: has + right: + - reit + - trust + - closeend sort: sortBy: market_cap_basic sortOrder: desc diff --git a/presets/kuwait.yaml b/presets/kuwait.yaml index 15bcd1a49..7300d20b5 100644 --- a/presets/kuwait.yaml +++ b/presets/kuwait.yaml @@ -569,12 +569,33 @@ presets: - left: typespecs operation: has_none_of right: preferred - - left: type - operation: in_range - right: - - stock - - dr - - structured + filter2: + operator: or + operands: + - operation: + operator: and + operands: + - expression: + left: type + operation: in_range + right: + - stock + - dr + - structured + - operation: + operator: and + operands: + - expression: + left: type + operation: equal + right: fund + - expression: + left: typespecs + operation: has + right: + - reit + - trust + - closeend sort: sortBy: market_cap_basic sortOrder: desc diff --git a/presets/latvia.yaml b/presets/latvia.yaml index 99be6cddc..1bb73535e 100644 --- a/presets/latvia.yaml +++ b/presets/latvia.yaml @@ -569,12 +569,33 @@ presets: - left: typespecs operation: has_none_of right: preferred - - left: type - operation: in_range - right: - - stock - - dr - - structured + filter2: + operator: or + operands: + - operation: + operator: and + operands: + - expression: + left: type + operation: in_range + right: + - stock + - dr + - structured + - operation: + operator: and + operands: + - expression: + left: type + operation: equal + right: fund + - expression: + left: typespecs + operation: has + right: + - reit + - trust + - closeend sort: sortBy: market_cap_basic sortOrder: desc diff --git a/presets/lithuania.yaml b/presets/lithuania.yaml index 91d7b4c71..a4c6fd38f 100644 --- a/presets/lithuania.yaml +++ b/presets/lithuania.yaml @@ -584,12 +584,33 @@ presets: - left: typespecs operation: has_none_of right: preferred - - left: type - operation: in_range - right: - - stock - - dr - - structured + filter2: + operator: or + operands: + - operation: + operator: and + operands: + - expression: + left: type + operation: in_range + right: + - stock + - dr + - structured + - operation: + operator: and + operands: + - expression: + left: type + operation: equal + right: fund + - expression: + left: typespecs + operation: has + right: + - reit + - trust + - closeend sort: sortBy: market_cap_basic sortOrder: desc diff --git a/presets/luxembourg.yaml b/presets/luxembourg.yaml index 91101e878..596358633 100644 --- a/presets/luxembourg.yaml +++ b/presets/luxembourg.yaml @@ -584,12 +584,33 @@ presets: - left: typespecs operation: has_none_of right: preferred - - left: type - operation: in_range - right: - - stock - - dr - - structured + filter2: + operator: or + operands: + - operation: + operator: and + operands: + - expression: + left: type + operation: in_range + right: + - stock + - dr + - structured + - operation: + operator: and + operands: + - expression: + left: type + operation: equal + right: fund + - expression: + left: typespecs + operation: has + right: + - reit + - trust + - closeend sort: sortBy: market_cap_basic sortOrder: desc diff --git a/presets/malaysia.yaml b/presets/malaysia.yaml index c35a33150..5e1edc330 100644 --- a/presets/malaysia.yaml +++ b/presets/malaysia.yaml @@ -584,12 +584,33 @@ presets: - left: typespecs operation: has_none_of right: preferred - - left: type - operation: in_range - right: - - stock - - dr - - structured + filter2: + operator: or + operands: + - operation: + operator: and + operands: + - expression: + left: type + operation: in_range + right: + - stock + - dr + - structured + - operation: + operator: and + operands: + - expression: + left: type + operation: equal + right: fund + - expression: + left: typespecs + operation: has + right: + - reit + - trust + - closeend sort: sortBy: market_cap_basic sortOrder: desc diff --git a/presets/mexico.yaml b/presets/mexico.yaml index 60f0a998a..13a875286 100644 --- a/presets/mexico.yaml +++ b/presets/mexico.yaml @@ -584,12 +584,33 @@ presets: - left: typespecs operation: has_none_of right: preferred - - left: type - operation: in_range - right: - - stock - - dr - - structured + filter2: + operator: or + operands: + - operation: + operator: and + operands: + - expression: + left: type + operation: in_range + right: + - stock + - dr + - structured + - operation: + operator: and + operands: + - expression: + left: type + operation: equal + right: fund + - expression: + left: typespecs + operation: has + right: + - reit + - trust + - closeend sort: sortBy: market_cap_basic sortOrder: desc diff --git a/presets/morocco.yaml b/presets/morocco.yaml index 4efefa9c9..a800a91f1 100644 --- a/presets/morocco.yaml +++ b/presets/morocco.yaml @@ -569,12 +569,33 @@ presets: - left: typespecs operation: has_none_of right: preferred - - left: type - operation: in_range - right: - - stock - - dr - - structured + filter2: + operator: or + operands: + - operation: + operator: and + operands: + - expression: + left: type + operation: in_range + right: + - stock + - dr + - structured + - operation: + operator: and + operands: + - expression: + left: type + operation: equal + right: fund + - expression: + left: typespecs + operation: has + right: + - reit + - trust + - closeend sort: sortBy: market_cap_basic sortOrder: desc diff --git a/presets/netherlands.yaml b/presets/netherlands.yaml index d621b9534..24ba2c2b9 100644 --- a/presets/netherlands.yaml +++ b/presets/netherlands.yaml @@ -584,12 +584,33 @@ presets: - left: typespecs operation: has_none_of right: preferred - - left: type - operation: in_range - right: - - stock - - dr - - structured + filter2: + operator: or + operands: + - operation: + operator: and + operands: + - expression: + left: type + operation: in_range + right: + - stock + - dr + - structured + - operation: + operator: and + operands: + - expression: + left: type + operation: equal + right: fund + - expression: + left: typespecs + operation: has + right: + - reit + - trust + - closeend sort: sortBy: market_cap_basic sortOrder: desc diff --git a/presets/newzealand.yaml b/presets/newzealand.yaml index 349881299..9d07e07a3 100644 --- a/presets/newzealand.yaml +++ b/presets/newzealand.yaml @@ -584,12 +584,33 @@ presets: - left: typespecs operation: has_none_of right: preferred - - left: type - operation: in_range - right: - - stock - - dr - - structured + filter2: + operator: or + operands: + - operation: + operator: and + operands: + - expression: + left: type + operation: in_range + right: + - stock + - dr + - structured + - operation: + operator: and + operands: + - expression: + left: type + operation: equal + right: fund + - expression: + left: typespecs + operation: has + right: + - reit + - trust + - closeend sort: sortBy: market_cap_basic sortOrder: desc diff --git a/presets/nigeria.yaml b/presets/nigeria.yaml index dd7dd6270..b41b260dc 100644 --- a/presets/nigeria.yaml +++ b/presets/nigeria.yaml @@ -584,12 +584,33 @@ presets: - left: typespecs operation: has_none_of right: preferred - - left: type - operation: in_range - right: - - stock - - dr - - structured + filter2: + operator: or + operands: + - operation: + operator: and + operands: + - expression: + left: type + operation: in_range + right: + - stock + - dr + - structured + - operation: + operator: and + operands: + - expression: + left: type + operation: equal + right: fund + - expression: + left: typespecs + operation: has + right: + - reit + - trust + - closeend sort: sortBy: market_cap_basic sortOrder: desc diff --git a/presets/norway.yaml b/presets/norway.yaml index f0cbaa7be..67c9c6817 100644 --- a/presets/norway.yaml +++ b/presets/norway.yaml @@ -584,12 +584,33 @@ presets: - left: typespecs operation: has_none_of right: preferred - - left: type - operation: in_range - right: - - stock - - dr - - structured + filter2: + operator: or + operands: + - operation: + operator: and + operands: + - expression: + left: type + operation: in_range + right: + - stock + - dr + - structured + - operation: + operator: and + operands: + - expression: + left: type + operation: equal + right: fund + - expression: + left: typespecs + operation: has + right: + - reit + - trust + - closeend sort: sortBy: market_cap_basic sortOrder: desc diff --git a/presets/pakistan.yaml b/presets/pakistan.yaml index 87a1f3974..95809b486 100644 --- a/presets/pakistan.yaml +++ b/presets/pakistan.yaml @@ -569,12 +569,33 @@ presets: - left: typespecs operation: has_none_of right: preferred - - left: type - operation: in_range - right: - - stock - - dr - - structured + filter2: + operator: or + operands: + - operation: + operator: and + operands: + - expression: + left: type + operation: in_range + right: + - stock + - dr + - structured + - operation: + operator: and + operands: + - expression: + left: type + operation: equal + right: fund + - expression: + left: typespecs + operation: has + right: + - reit + - trust + - closeend sort: sortBy: market_cap_basic sortOrder: desc diff --git a/presets/peru.yaml b/presets/peru.yaml index b999610cc..012445698 100644 --- a/presets/peru.yaml +++ b/presets/peru.yaml @@ -584,12 +584,33 @@ presets: - left: typespecs operation: has_none_of right: preferred - - left: type - operation: in_range - right: - - stock - - dr - - structured + filter2: + operator: or + operands: + - operation: + operator: and + operands: + - expression: + left: type + operation: in_range + right: + - stock + - dr + - structured + - operation: + operator: and + operands: + - expression: + left: type + operation: equal + right: fund + - expression: + left: typespecs + operation: has + right: + - reit + - trust + - closeend sort: sortBy: market_cap_basic sortOrder: desc diff --git a/presets/philippines.yaml b/presets/philippines.yaml index 8e39d2ce8..1e7e2316a 100644 --- a/presets/philippines.yaml +++ b/presets/philippines.yaml @@ -584,12 +584,33 @@ presets: - left: typespecs operation: has_none_of right: preferred - - left: type - operation: in_range - right: - - stock - - dr - - structured + filter2: + operator: or + operands: + - operation: + operator: and + operands: + - expression: + left: type + operation: in_range + right: + - stock + - dr + - structured + - operation: + operator: and + operands: + - expression: + left: type + operation: equal + right: fund + - expression: + left: typespecs + operation: has + right: + - reit + - trust + - closeend sort: sortBy: market_cap_basic sortOrder: desc diff --git a/presets/poland.yaml b/presets/poland.yaml index 7f90a5cf1..68093d84d 100644 --- a/presets/poland.yaml +++ b/presets/poland.yaml @@ -584,12 +584,33 @@ presets: - left: typespecs operation: has_none_of right: preferred - - left: type - operation: in_range - right: - - stock - - dr - - structured + filter2: + operator: or + operands: + - operation: + operator: and + operands: + - expression: + left: type + operation: in_range + right: + - stock + - dr + - structured + - operation: + operator: and + operands: + - expression: + left: type + operation: equal + right: fund + - expression: + left: typespecs + operation: has + right: + - reit + - trust + - closeend sort: sortBy: market_cap_basic sortOrder: desc diff --git a/presets/portugal.yaml b/presets/portugal.yaml index 861a5137f..ef1747b5b 100644 --- a/presets/portugal.yaml +++ b/presets/portugal.yaml @@ -584,12 +584,33 @@ presets: - left: typespecs operation: has_none_of right: preferred - - left: type - operation: in_range - right: - - stock - - dr - - structured + filter2: + operator: or + operands: + - operation: + operator: and + operands: + - expression: + left: type + operation: in_range + right: + - stock + - dr + - structured + - operation: + operator: and + operands: + - expression: + left: type + operation: equal + right: fund + - expression: + left: typespecs + operation: has + right: + - reit + - trust + - closeend sort: sortBy: market_cap_basic sortOrder: desc diff --git a/presets/qatar.yaml b/presets/qatar.yaml index f2245d797..7e9fb88af 100644 --- a/presets/qatar.yaml +++ b/presets/qatar.yaml @@ -584,12 +584,33 @@ presets: - left: typespecs operation: has_none_of right: preferred - - left: type - operation: in_range - right: - - stock - - dr - - structured + filter2: + operator: or + operands: + - operation: + operator: and + operands: + - expression: + left: type + operation: in_range + right: + - stock + - dr + - structured + - operation: + operator: and + operands: + - expression: + left: type + operation: equal + right: fund + - expression: + left: typespecs + operation: has + right: + - reit + - trust + - closeend sort: sortBy: market_cap_basic sortOrder: desc diff --git a/presets/romania.yaml b/presets/romania.yaml index f4d8b058a..8829553f6 100644 --- a/presets/romania.yaml +++ b/presets/romania.yaml @@ -584,12 +584,33 @@ presets: - left: typespecs operation: has_none_of right: preferred - - left: type - operation: in_range - right: - - stock - - dr - - structured + filter2: + operator: or + operands: + - operation: + operator: and + operands: + - expression: + left: type + operation: in_range + right: + - stock + - dr + - structured + - operation: + operator: and + operands: + - expression: + left: type + operation: equal + right: fund + - expression: + left: typespecs + operation: has + right: + - reit + - trust + - closeend sort: sortBy: market_cap_basic sortOrder: desc diff --git a/presets/rsa.yaml b/presets/rsa.yaml index e42e84fe7..66bf4b6ca 100644 --- a/presets/rsa.yaml +++ b/presets/rsa.yaml @@ -584,12 +584,33 @@ presets: - left: typespecs operation: has_none_of right: preferred - - left: type - operation: in_range - right: - - stock - - dr - - structured + filter2: + operator: or + operands: + - operation: + operator: and + operands: + - expression: + left: type + operation: in_range + right: + - stock + - dr + - structured + - operation: + operator: and + operands: + - expression: + left: type + operation: equal + right: fund + - expression: + left: typespecs + operation: has + right: + - reit + - trust + - closeend sort: sortBy: market_cap_basic sortOrder: desc diff --git a/presets/russia.yaml b/presets/russia.yaml index 3fe7d01cd..eec642599 100644 --- a/presets/russia.yaml +++ b/presets/russia.yaml @@ -572,12 +572,33 @@ presets: - left: typespecs operation: has_none_of right: preferred - - left: type - operation: in_range - right: - - stock - - dr - - structured + filter2: + operator: or + operands: + - operation: + operator: and + operands: + - expression: + left: type + operation: in_range + right: + - stock + - dr + - structured + - operation: + operator: and + operands: + - expression: + left: type + operation: equal + right: fund + - expression: + left: typespecs + operation: has + right: + - reit + - trust + - closeend sort: sortBy: market_cap_basic sortOrder: desc diff --git a/presets/serbia.yaml b/presets/serbia.yaml index d49bff3f7..82e140951 100644 --- a/presets/serbia.yaml +++ b/presets/serbia.yaml @@ -584,12 +584,33 @@ presets: - left: typespecs operation: has_none_of right: preferred - - left: type - operation: in_range - right: - - stock - - dr - - structured + filter2: + operator: or + operands: + - operation: + operator: and + operands: + - expression: + left: type + operation: in_range + right: + - stock + - dr + - structured + - operation: + operator: and + operands: + - expression: + left: type + operation: equal + right: fund + - expression: + left: typespecs + operation: has + right: + - reit + - trust + - closeend sort: sortBy: market_cap_basic sortOrder: desc diff --git a/presets/singapore.yaml b/presets/singapore.yaml index a29299a4f..137e557db 100644 --- a/presets/singapore.yaml +++ b/presets/singapore.yaml @@ -584,12 +584,33 @@ presets: - left: typespecs operation: has_none_of right: preferred - - left: type - operation: in_range - right: - - stock - - dr - - structured + filter2: + operator: or + operands: + - operation: + operator: and + operands: + - expression: + left: type + operation: in_range + right: + - stock + - dr + - structured + - operation: + operator: and + operands: + - expression: + left: type + operation: equal + right: fund + - expression: + left: typespecs + operation: has + right: + - reit + - trust + - closeend sort: sortBy: market_cap_basic sortOrder: desc diff --git a/presets/slovakia.yaml b/presets/slovakia.yaml index a961708da..4f90138ad 100644 --- a/presets/slovakia.yaml +++ b/presets/slovakia.yaml @@ -584,12 +584,33 @@ presets: - left: typespecs operation: has_none_of right: preferred - - left: type - operation: in_range - right: - - stock - - dr - - structured + filter2: + operator: or + operands: + - operation: + operator: and + operands: + - expression: + left: type + operation: in_range + right: + - stock + - dr + - structured + - operation: + operator: and + operands: + - expression: + left: type + operation: equal + right: fund + - expression: + left: typespecs + operation: has + right: + - reit + - trust + - closeend sort: sortBy: market_cap_basic sortOrder: desc diff --git a/presets/spain.yaml b/presets/spain.yaml index 3cf3106e8..5f2cb9d49 100644 --- a/presets/spain.yaml +++ b/presets/spain.yaml @@ -584,12 +584,33 @@ presets: - left: typespecs operation: has_none_of right: preferred - - left: type - operation: in_range - right: - - stock - - dr - - structured + filter2: + operator: or + operands: + - operation: + operator: and + operands: + - expression: + left: type + operation: in_range + right: + - stock + - dr + - structured + - operation: + operator: and + operands: + - expression: + left: type + operation: equal + right: fund + - expression: + left: typespecs + operation: has + right: + - reit + - trust + - closeend sort: sortBy: market_cap_basic sortOrder: desc diff --git a/presets/srilanka.yaml b/presets/srilanka.yaml index f60e32335..f65784843 100644 --- a/presets/srilanka.yaml +++ b/presets/srilanka.yaml @@ -569,12 +569,33 @@ presets: - left: typespecs operation: has_none_of right: preferred - - left: type - operation: in_range - right: - - stock - - dr - - structured + filter2: + operator: or + operands: + - operation: + operator: and + operands: + - expression: + left: type + operation: in_range + right: + - stock + - dr + - structured + - operation: + operator: and + operands: + - expression: + left: type + operation: equal + right: fund + - expression: + left: typespecs + operation: has + right: + - reit + - trust + - closeend sort: sortBy: market_cap_basic sortOrder: desc diff --git a/presets/sweden.yaml b/presets/sweden.yaml index d1cf53602..59e787e7f 100644 --- a/presets/sweden.yaml +++ b/presets/sweden.yaml @@ -584,12 +584,33 @@ presets: - left: typespecs operation: has_none_of right: preferred - - left: type - operation: in_range - right: - - stock - - dr - - structured + filter2: + operator: or + operands: + - operation: + operator: and + operands: + - expression: + left: type + operation: in_range + right: + - stock + - dr + - structured + - operation: + operator: and + operands: + - expression: + left: type + operation: equal + right: fund + - expression: + left: typespecs + operation: has + right: + - reit + - trust + - closeend sort: sortBy: market_cap_basic sortOrder: desc diff --git a/presets/switzerland.yaml b/presets/switzerland.yaml index 4c8203e56..4dfe5bf37 100644 --- a/presets/switzerland.yaml +++ b/presets/switzerland.yaml @@ -584,12 +584,33 @@ presets: - left: typespecs operation: has_none_of right: preferred - - left: type - operation: in_range - right: - - stock - - dr - - structured + filter2: + operator: or + operands: + - operation: + operator: and + operands: + - expression: + left: type + operation: in_range + right: + - stock + - dr + - structured + - operation: + operator: and + operands: + - expression: + left: type + operation: equal + right: fund + - expression: + left: typespecs + operation: has + right: + - reit + - trust + - closeend sort: sortBy: market_cap_basic sortOrder: desc diff --git a/presets/taiwan.yaml b/presets/taiwan.yaml index 3b6c91366..65b2e2cc7 100644 --- a/presets/taiwan.yaml +++ b/presets/taiwan.yaml @@ -584,12 +584,33 @@ presets: - left: typespecs operation: has_none_of right: preferred - - left: type - operation: in_range - right: - - stock - - dr - - structured + filter2: + operator: or + operands: + - operation: + operator: and + operands: + - expression: + left: type + operation: in_range + right: + - stock + - dr + - structured + - operation: + operator: and + operands: + - expression: + left: type + operation: equal + right: fund + - expression: + left: typespecs + operation: has + right: + - reit + - trust + - closeend sort: sortBy: market_cap_basic sortOrder: desc diff --git a/presets/thailand.yaml b/presets/thailand.yaml index 405272355..06faecf43 100644 --- a/presets/thailand.yaml +++ b/presets/thailand.yaml @@ -677,12 +677,33 @@ presets: - left: typespecs operation: has_none_of right: preferred - - left: type - operation: in_range - right: - - stock - - dr - - structured + filter2: + operator: or + operands: + - operation: + operator: and + operands: + - expression: + left: type + operation: in_range + right: + - stock + - dr + - structured + - operation: + operator: and + operands: + - expression: + left: type + operation: equal + right: fund + - expression: + left: typespecs + operation: has + right: + - reit + - trust + - closeend sort: sortBy: market_cap_basic sortOrder: desc diff --git a/presets/tunisia.yaml b/presets/tunisia.yaml index 086f25fdc..bc410c108 100644 --- a/presets/tunisia.yaml +++ b/presets/tunisia.yaml @@ -569,12 +569,33 @@ presets: - left: typespecs operation: has_none_of right: preferred - - left: type - operation: in_range - right: - - stock - - dr - - structured + filter2: + operator: or + operands: + - operation: + operator: and + operands: + - expression: + left: type + operation: in_range + right: + - stock + - dr + - structured + - operation: + operator: and + operands: + - expression: + left: type + operation: equal + right: fund + - expression: + left: typespecs + operation: has + right: + - reit + - trust + - closeend sort: sortBy: market_cap_basic sortOrder: desc diff --git a/presets/turkey.yaml b/presets/turkey.yaml index 13d082f1e..8afcc2c94 100644 --- a/presets/turkey.yaml +++ b/presets/turkey.yaml @@ -569,12 +569,33 @@ presets: - left: typespecs operation: has_none_of right: preferred - - left: type - operation: in_range - right: - - stock - - dr - - structured + filter2: + operator: or + operands: + - operation: + operator: and + operands: + - expression: + left: type + operation: in_range + right: + - stock + - dr + - structured + - operation: + operator: and + operands: + - expression: + left: type + operation: equal + right: fund + - expression: + left: typespecs + operation: has + right: + - reit + - trust + - closeend sort: sortBy: market_cap_basic sortOrder: desc diff --git a/presets/uae.yaml b/presets/uae.yaml index 663d307a5..420dfaeba 100644 --- a/presets/uae.yaml +++ b/presets/uae.yaml @@ -584,12 +584,33 @@ presets: - left: typespecs operation: has_none_of right: preferred - - left: type - operation: in_range - right: - - stock - - dr - - structured + filter2: + operator: or + operands: + - operation: + operator: and + operands: + - expression: + left: type + operation: in_range + right: + - stock + - dr + - structured + - operation: + operator: and + operands: + - expression: + left: type + operation: equal + right: fund + - expression: + left: typespecs + operation: has + right: + - reit + - trust + - closeend sort: sortBy: market_cap_basic sortOrder: desc diff --git a/presets/uk.yaml b/presets/uk.yaml index 428b3e455..7161bab9f 100644 --- a/presets/uk.yaml +++ b/presets/uk.yaml @@ -682,12 +682,33 @@ presets: - left: typespecs operation: has_none_of right: preferred - - left: type - operation: in_range - right: - - stock - - dr - - structured + filter2: + operator: or + operands: + - operation: + operator: and + operands: + - expression: + left: type + operation: in_range + right: + - stock + - dr + - structured + - operation: + operator: and + operands: + - expression: + left: type + operation: equal + right: fund + - expression: + left: typespecs + operation: has + right: + - reit + - trust + - closeend sort: sortBy: market_cap_basic sortOrder: desc diff --git a/presets/venezuela.yaml b/presets/venezuela.yaml index 467fe9c2a..39d38b377 100644 --- a/presets/venezuela.yaml +++ b/presets/venezuela.yaml @@ -569,12 +569,33 @@ presets: - left: typespecs operation: has_none_of right: preferred - - left: type - operation: in_range - right: - - stock - - dr - - structured + filter2: + operator: or + operands: + - operation: + operator: and + operands: + - expression: + left: type + operation: in_range + right: + - stock + - dr + - structured + - operation: + operator: and + operands: + - expression: + left: type + operation: equal + right: fund + - expression: + left: typespecs + operation: has + right: + - reit + - trust + - closeend sort: sortBy: market_cap_basic sortOrder: desc diff --git a/presets/vietnam.yaml b/presets/vietnam.yaml index 02fb22c2f..70c388f35 100644 --- a/presets/vietnam.yaml +++ b/presets/vietnam.yaml @@ -584,12 +584,33 @@ presets: - left: typespecs operation: has_none_of right: preferred - - left: type - operation: in_range - right: - - stock - - dr - - structured + filter2: + operator: or + operands: + - operation: + operator: and + operands: + - expression: + left: type + operation: in_range + right: + - stock + - dr + - structured + - operation: + operator: and + operands: + - expression: + left: type + operation: equal + right: fund + - expression: + left: typespecs + operation: has + right: + - reit + - trust + - closeend sort: sortBy: market_cap_basic sortOrder: desc