More accurate description of the term- and goal-expansion mechanisms