Fixed display of date, but needs proper solution.
Added a test-value on "and/or".