Added - charts generation with simple filtering