adding fetch based on date rather then all