Corrected handling of inner tabs.

Jira issue: HUBWH-6