[blvet:rhel7/master 0/8] Fix problems with what accordion displays (v3)