Fixed BUG: The wrong tab header is highlighted

Fix for all modules, where this BUG appeared.

https://trello.com/c/J4sGoOKE

Change-Id: I16be60572ffb7dfc15bb2a8009b323711743f530