cleanup code to support all bouquet naming, this add's AutoBouquetMaker support.