Fixed Some Bugs some bugs with Filter and Plot