Small filters fix - apply only once