Fix services + add template controller echo