Category Tag: safety improvements