Fixed message template replacement when data values are empty