Fix return value forimage/logo display.
Ensure image/logo is displayed while editing entry.

fixes gh-332