TagsSafety improvement