Update: Improved date filtering