Issue #117: Incorrect tab highlighting for EMP  and BDM fixed
Merge pull request #118 from Bohdan-Tereta/development

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