[HOTFIX] Loader bugs in content form

Loader bugs in content form:

__Tasks:__

- [ ] gather feedback for my changes

__Informations:__

| Q             | A
| ------------- | ---
| Tests pass?   | yes
| Fixed tickets | #185, #179 
| BC Breaks     | none
| Doc           | none