- adapted to NAF and term ids adapted to requirement that they should end with a digit