Search container name bugfix