Image upload event subscriber and form fix