2 additional templates

also template filter based on tags only