Added fix for missings tags
Added fix for missings tags