Send tags with the service checks + code cleaning