added more match criterias