Moved Filters to new Template