Better targeting for containers with one item