Improve handling of "Last/This week:" headers