ctrl-container & ctrl-container-list fixes