GFI templating fix

Fixes a problem with the kvp rule.