fixed model and collection templates