Image Tagging: fixes after refactoring