*8094* Minor template manager tweaking