[OE-3740] Quicklook and toggle fixes