Add and fix Duration tags, fixes #748

- Hours was doubling the value
- days/weeks both added