Implement the general HTML snippets substitution (e.g do the substitution in attributes too) + some small changes.