Fixed logic so live collections work