templating improvements for different aliases