Liquid template loading imporvement