Added a more generic air storage avoidance in blueprints, close #1712.