CMS-3939 Make input type Tag