Fixed querying empty containers.