Templates adjusts for new fields and new filter (collection)