updating to support dynamic tabs / watch expressions