Multi Select when Editing / Creating Shipping Rules

Currently the shipping rules can only be set with one answer per criteria, meaning we have to create dozens and dozens of shipping rules which become very hard to manage when you want to make a small change. It would be extremely useful if we could select multiple answers to each criteria, ie the shipping rule will match IF: Shipping Zone = Matches Zone 1, or Zone 2 Packaging Size = Matches Box1, Box2 or Box 3 This would save us a big big headache, and remove a lot of the risk associated with creating / editing rules as it will be less confusing.