Further changes for filters