Fixing some problems with "selective preview"