Various bug fixes & multi-value preview fix