fix to check for empty container name, not name == '0'
fixed more container name issues