Improved CurrentView to align better with expected behaviour.