Update the logic for MSB addr Query