Change disjunction to defaultsTo()