fixed up handling additional match terms