Minor changes to filters