missing tokens

Even though I firmly believe this is a bug, I have been requested by support to file a feature request.  Please include WILDVALUE with the alert tokens so that can be referenced in templates. 

Please also add a method of referencing instance level properties as tokens, perhaps with a different delimiter to avoid conflict with device properties.

Thanks,
Mark