added null check and html to required_tag
Merge branch 'feature/showtags' into develop