Updated graphing to use the new filter system