Clean Up

Added a few missing filters