[#82259176] Past variant lookup improvements

Story: https://www.pivotaltracker.com/story/show/82259176