Fix for date range and numeric filter values