Fix problem with templatetag
Merge branch 'fix-container_tags' into sandbox