Add missing filters
Fix look and align