Added peek-row support for one-off templates