Improvements to filters
merging local changes