Tag fixes
Add image field