uploads template tag refactorings;