z-index-group: fix after review