Fixed BUG: The wrong tab header is highlighted

Fix for all modules, where this BUG appeared.

https://trello.com/c/J4sGoOKE

Change-Id: I6ad8cf2486fc15027ad420994e75f77bee8279b2