Modified the way we decide to show basket list