More updates in image_entry and template variables