Update BBS query and change output field names for all datsetsso that they are consisent