Fix shelf navigation for all containers