-  fix piechart to deal with ContextEntity and Block Entity parameters correctly :(