Fix regression when editing an image
Fix regression: 500 errors were not displayed correctly
Bullet-proof
Some handlebars context improvements