Improve handling of previews