Fixed BUG: The wrong tab header is highlighted

Fix for all modules, where this BUG appeared.

https://trello.com/c/J4sGoOKE

Change-Id: Idd380aa0eef3543098f79f82c350f0dc36e2e1aa