[Saucy] adjust keywords to prevent not needed updates