Fixed multiword terms matching regular expression, added boundary condition for vocab. list