Added fix for missings tags