Filter Controller and Improvements