More robust mdate filter