Added additional function match map generation after function match
Fixed get match map query
Fixed target non-match count