More fixes for basket count.