Bug fixes in ListVC && ListContainerVC