Improved conversation matcher for service messages
Removed commented out code
Fixed parsing error