[CLC-2123] Directives followup to deal with html snippets
[CLC-2123] Directives fixes