Revamp preview thread handling