Fix clear filter button, add client template