Fixed various issues with the new container selection