improve show_match