finally fix filters