Filtering fixes
improving filter