Enhanced tags generation