Stricter routing
Be more flexible when parsing date