Issue #117: Incorrect tab highlighting for EMP  and BDM fixed