improved initial ordering #15855147422164

added or operator for scopes
refactored index actions