Fixes for filters