changed lanugage, matching and removed count cache