Changes to keep quick view displaying properly