Refactor to use filter.html instead of tag.html and category.html