Refactor date tag