Matcher now supports None-typed departure dates