Fixes for filter encoding issues