CRM-13187 - Coding corrections for status and match type

 Coding corrections to handle status and match type