improvements of term analyzer in mapper