Fix Defualt Broker & Destination Queue Name Check