Switching between lists fixed