Support unwrapping and make virtualized Rows work again