added tags to template
changed context object name