added check to confirm valid match is returned
additional fix to current match service