fix Bpsi_use name and remove BIF from output lists