BZ-9588: Fix issue regarding tabs showing wrong content