Filter & template amends