Bug fixes - hash access was using Date instead of String