various bugfix, remove duplicated B hadron matching