small fixes for multiple preview