+ improve Date searching