Adding filtering line chart, remaining handling