Fix template/service order.