Markup Fix

Added template vars.