Rework autocomplete so that attribute is only added if call-template includes parameter