Added more logging info in matchMap
Unified the logging in matchMap