template adjustments [MJ-374]