Fix NLA resolving
Fix Date display for YYYY-formatted dates