Edit content details issues

Continuation of #3578