BACKLOG-845 Wrapped js code in tags just before rendering instead of on adding code