Updated preview logic