Made tag/value substitution work