Cleaning & filter fixes