LV not granting Fear Immunity since the DS Clone-centric rework

Since LV's rework to work with DS Clones, his leadership ability doesn't apply the Fear Immunity properly. The problem is with the order of the queries: 

Originally Context #1 and 2 would look for allies who are not Dark Side, and the Fear Immunity (currently Context #5) would skip execution if the value was more than zero. 

Now there's an additional query between the Contexts mentioned above, Context #3 and 4. These ones count LV and the number of DS Clones on the team. 

Because the Fear Immunity only takes "the previous query" into account, not a specific entry (Context #2), it will currenty not take effect as Context #4 will always return at least 1 (LV himself). 

Either the queries should be reordered, i.e the Fear Immunity should be #3, the LV+DSCT queries #4 and 5. Or the Fear Immunity should take the result of Context #2 into account.