Fix for missing '@' prefix of @usedns in template