PR5 Fix: Time keys fail if empty