updated main and filter templates