+ optional file warning
fix better condition support in expression-properties