Fix graph formatting, add filtering