Refactored #total_match_count