fixes in image upload for polymorphic forms
merge