Fix modification time disappearing from context data and handling missing value