with search by date too