minor: improving tags generation