Fix labels issues with matrix templates

Césarrequested to merge
2.x#dev into 2.x

Hi @sluc23 this merge request contains two fixes for label issues. All errors are reproduced in matrix templates. Reported here: #5 (closed)

Edited by César

Merge request reports