Edit content bug fixes (JHS)