orderedFlavors fixing + router