further tags fix