ENG-7308 changed string matching to criteria