Separate search with and without date