date form search behaves normally
fix npe
fix npe with date