Was improved display templates