[parser] refactor until option field

Waiting on Eldric to fix date parse