Fixed some errors in _pick_most_complete_match and also added a rule of thumb logic to fix #28.