add more match fields
add more tests for match fields